From 4da6672581e5dac3b886ad42a5c4275eb7024388 Mon Sep 17 00:00:00 2001 From: jlukic Date: Thu, 1 Jan 2015 15:05:28 -0500 Subject: [PATCH 1/3] Fixes #1542, typo from cd9f4f9e58 fix caused fullTextRegexp to match all values in search --- src/definitions/modules/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/definitions/modules/search.js b/src/definitions/modules/search.js index 975797e9e..6a331e63a 100644 --- a/src/definitions/modules/search.js +++ b/src/definitions/modules/search.js @@ -305,7 +305,7 @@ $.fn.search = function(parameters) { if( content[field].match(searchRegExp) ) { results.push(content); } - else if( settings.searchFullText && content[field].match(content[field]) ) { + else if( settings.searchFullText && content[field].match(fullTextRegExp) ) { fullTextResults.push(content); } } From 3aa885b6c19f48e63726a67b3fbe91063c61e0ce Mon Sep 17 00:00:00 2001 From: jlukic Date: Thu, 1 Jan 2015 15:07:37 -0500 Subject: [PATCH 2/3] Fix #1536 animated alignment --- src/definitions/elements/button.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/definitions/elements/button.less b/src/definitions/elements/button.less index 66a204864..b7ad9aeb5 100755 --- a/src/definitions/elements/button.less +++ b/src/definitions/elements/button.less @@ -222,6 +222,7 @@ .ui.animated.button { position: relative; overflow: hidden; + vertical-align: @animatedVerticalAlign; padding-right: 0em !important; } From 1a701e20ab6725c346376dab282b01b52ab3920b Mon Sep 17 00:00:00 2001 From: jlukic Date: Thu, 1 Jan 2015 15:31:33 -0500 Subject: [PATCH 3/3] Make useLegacy more obvious in sidebar, default to auto --- src/definitions/modules/sidebar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/definitions/modules/sidebar.js b/src/definitions/modules/sidebar.js index a95d0832d..33924a942 100644 --- a/src/definitions/modules/sidebar.js +++ b/src/definitions/modules/sidebar.js @@ -83,7 +83,7 @@ $.fn.sidebar = function(parameters) { transitionEvent = module.get.transitionEvent(); // cache on initialize - if( module.is.legacy() || settings.legacy) { + if( (module.useLegacy == 'auto' && module.is.legacy()) || settings.useLegacy) { settings.transition = 'overlay'; settings.useLegacy = true; } @@ -991,7 +991,7 @@ $.fn.sidebar.settings = { scrollLock : false, returnScroll : false, - useLegacy : false, + useLegacy : 'auto', duration : 500, easing : 'easeInOutQuint',