From 3d40e98ae4ba10e55998fbb2739e08162bf49435 Mon Sep 17 00:00:00 2001 From: jlukic Date: Mon, 10 Feb 2014 23:58:12 -0500 Subject: [PATCH] Removes important from theme overrides --- src/collections/grid.less | 9 +++++ src/collections/menu.less | 2 +- src/elements/button.less | 4 +-- src/elements/divider.less | 2 +- src/elements/header.less | 3 +- src/elements/icon.less | 2 +- src/elements/image.less | 2 +- src/elements/segment.less | 2 +- src/modules/behavior/api.js | 14 +++++--- src/modules/search.js | 34 +++++++++++++------ src/modules/transition.less | 4 +-- src/themes/default/elements/button.variables | 3 +- src/themes/default/elements/divider.variables | 1 - 13 files changed, 54 insertions(+), 28 deletions(-) diff --git a/src/collections/grid.less b/src/collections/grid.less index 9cacf8f75..0f9df6bfb 100755 --- a/src/collections/grid.less +++ b/src/collections/grid.less @@ -38,6 +38,15 @@ body > .ui.grid { visibility: hidden; } +/*------------------- + Inner Grid +--------------------*/ + +.ui.grid > .grid { + margin-left: 0em !important; + margin-right: 0em !important; +} + /*------------------- Columns --------------------*/ diff --git a/src/collections/menu.less b/src/collections/menu.less index cbb3f4ef2..237ac2fb6 100755 --- a/src/collections/menu.less +++ b/src/collections/menu.less @@ -1616,4 +1616,4 @@ width: @largeWidth; } -.loadUIOverrides() !important; +.loadUIOverrides(); diff --git a/src/elements/button.less b/src/elements/button.less index 03b58c16a..739f7f055 100755 --- a/src/elements/button.less +++ b/src/elements/button.less @@ -845,7 +845,7 @@ position: absolute; top: 50%; left: 50%; - content: @orText; + content: 'or'; background-color: @white; text-shadow: @invertedTextShadow; @@ -1460,4 +1460,4 @@ border-radius: 0px 0px @borderRadius @borderRadius; } -.loadUIOverrides() !important; +.loadUIOverrides(); diff --git a/src/elements/divider.less b/src/elements/divider.less index 1a2c5cb28..3f274e0c1 100755 --- a/src/elements/divider.less +++ b/src/elements/divider.less @@ -206,4 +206,4 @@ margin-bottom: @sectionMargin; } -.loadUIOverrides() !important; +.loadUIOverrides(); diff --git a/src/elements/header.less b/src/elements/header.less index aa84ff07a..c39e7d20d 100755 --- a/src/elements/header.less +++ b/src/elements/header.less @@ -31,6 +31,7 @@ font-weight: @fontWeight; line-height: @lineHeight; text-transform: @textTransform; + color: @textColor; } .ui.header .sub.header { @@ -362,4 +363,4 @@ h5.ui.header { font-size: @medium; } -.loadUIOverrides() !important; \ No newline at end of file +.loadUIOverrides(); \ No newline at end of file diff --git a/src/elements/icon.less b/src/elements/icon.less index 3810153d2..8faef3295 100755 --- a/src/elements/icon.less +++ b/src/elements/icon.less @@ -307,4 +307,4 @@ i.massive.icon { vertical-align: middle; } -.loadUIOverrides() !important; +.loadUIOverrides(); diff --git a/src/elements/image.less b/src/elements/image.less index 2dc1ab2e5..33a9b5810 100755 --- a/src/elements/image.less +++ b/src/elements/image.less @@ -202,4 +202,4 @@ img.ui.image { margin: 0em @imageHorizontalMargin @imageVerticalMargin; } -.loadUIOverrides() !important; \ No newline at end of file +.loadUIOverrides(); \ No newline at end of file diff --git a/src/elements/segment.less b/src/elements/segment.less index b0718461a..dbfb3ba1d 100755 --- a/src/elements/segment.less +++ b/src/elements/segment.less @@ -434,4 +434,4 @@ margin-bottom: 0em; } -.loadUIOverrides() !important; +.loadUIOverrides(); diff --git a/src/modules/behavior/api.js b/src/modules/behavior/api.js index a6cf121dc..b8ad7af0d 100755 --- a/src/modules/behavior/api.js +++ b/src/modules/behavior/api.js @@ -272,12 +272,18 @@ $.api = $.fn.api = function(parameters) { done: function(response) { module.debug('API request received', response); if(settings.dataType == 'json') { - module.debug('Checking JSON', settings.successTest, response); - if( $.isFunction(settings.successTest) && settings.success(response) ) { - $.proxy(settings.success, $context)(response, $module); + if( $.isFunction(settings.successTest) ) { + module.debug('Checking JSON', settings.successTest, response); + if( settings.success(response) ) { + $.proxy(settings.success, $context)(response, $module); + } + else { + module.debug('JSON test specified by user and response failed', response); + $.proxy(settings.failure, $context)(response, $module); + } } else { - $.proxy(settings.failure, $context)(response, $module); + $.proxy(settings.success, $context)(response, $module); } } else { diff --git a/src/modules/search.js b/src/modules/search.js index 5cd31474c..97bad4088 100755 --- a/src/modules/search.js +++ b/src/modules/search.js @@ -11,7 +11,7 @@ ;(function ($, window, document, undefined) { -$.fn.search = function(source, parameters) { +$.fn.search = function(parameters) { var $allModules = $(this), moduleSelector = $allModules.selector || '', @@ -55,9 +55,9 @@ $.fn.search = function(source, parameters) { module.verbose('Initializing module'); var prompt = $prompt[0], - inputEvent = (prompt.oninput !== undefined) + inputEvent = (prompt !== undefined && prompt.oninput !== undefined) ? 'input' - : (prompt.onpropertychange !== undefined) + : (prompt !== undefined && prompt.onpropertychange !== undefined) ? 'propertychange' : 'keyup' ; @@ -232,12 +232,22 @@ $.fn.search = function(source, parameters) { } else { module.debug("Querying for '" + searchTerm + "'"); - if(typeof source == 'object') { + if($.isPlainObject(settings.source)) { module.search.local(searchTerm); } - else { + else if(settings.apiSettings) { + module.search.remote(searchTerm); + } + else if($.api !== undefined && $.api.settings.api.search !== undefined) { + module.debug('Searching with default search API endpoint'); + settings.apiSettings = { + action: 'search' + }; module.search.remote(searchTerm); } + else { + module.error(error.source); + } $.proxy(settings.onSearchQuery, $module)(searchTerm); } }, @@ -258,7 +268,7 @@ $.fn.search = function(source, parameters) { ; // iterate through search fields in array order $.each(searchFields, function(index, field) { - $.each(source, function(label, thing) { + $.each(settings.source, function(label, thing) { if(typeof thing[field] == 'string' && ($.inArray(thing, results) == -1) && ($.inArray(thing, fullTextResults) == -1) ) { if( searchRegExp.test( thing[field] ) ) { results.push(thing); @@ -282,8 +292,9 @@ $.fn.search = function(source, parameters) { var apiSettings = { stateContext : $module, - url : source, - urlData: { query: searchTerm }, + urlData: { + query: searchTerm + }, success : function(response) { searchHTML = module.results.generate(response); module.search.cache.write(searchTerm, searchHTML); @@ -601,6 +612,8 @@ $.fn.search.settings = { onResultsOpen : function(){}, onResultsClose : function(){}, + source : false, + automatic : 'true', type : 'simple', minCharacters : 3, @@ -614,9 +627,7 @@ $.fn.search.settings = { ], // api config - apiSettings: { - - }, + apiSettings: false, className: { active : 'active', @@ -627,6 +638,7 @@ $.fn.search.settings = { }, error : { + source : 'No source or api action specified', noResults : 'Your search returned no results', logging : 'Error in debug logging, exiting.', noTemplate : 'A valid template name was not specified.', diff --git a/src/modules/transition.less b/src/modules/transition.less index 861abb012..f39caaf03 100755 --- a/src/modules/transition.less +++ b/src/modules/transition.less @@ -26,7 +26,7 @@ *******************************/ .ui.animating.transition { - display: block; + display: block !important; backface-visibility: hidden; transform: translateZ(0); } @@ -45,7 +45,7 @@ /* Visible */ .ui.visible.transition { - display: block; + display: block !important; visibility: visible; } diff --git a/src/themes/default/elements/button.variables b/src/themes/default/elements/button.variables index 5c46b4b8d..26a244cdc 100755 --- a/src/themes/default/elements/button.variables +++ b/src/themes/default/elements/button.variables @@ -33,7 +33,7 @@ ; /* transitions */ -@transition: +@transition: opacity @transitionDuration @transitionEasing, background-color @transitionDuration @transitionEasing, color @transitionDuration @transitionEasing, @@ -88,7 +88,6 @@ --------------------*/ /* Or */ -@orText: 'or'; @orWidth: 0.3em; @orHeight: 1.1em; diff --git a/src/themes/default/elements/divider.variables b/src/themes/default/elements/divider.variables index 38bb8846f..69efa17da 100755 --- a/src/themes/default/elements/divider.variables +++ b/src/themes/default/elements/divider.variables @@ -19,7 +19,6 @@ --------------------*/ /* Icon */ - @dividerIconSize: 1rem; @dividerIconMargin: 0rem;