From d1a8552b2d015354cc1086f8b9039a9131b955b6 Mon Sep 17 00:00:00 2001 From: Stephen James Date: Fri, 5 Dec 2014 11:57:10 -0500 Subject: [PATCH 1/2] No saucelabs in TravisCI, clean up grunt tasks Checkbox / Radio: Setting checked attribute on underlying input #906 bump dist Checkbox / Radio: Setting checked attribute on underlying input #906 bump dist Checkbox / Radio: Setting checked attribute on underlying input #906 Wrapping in boolean if statement and cleaning up comments. (avoid-dupe-theads) make sure thead actually gets removed Update to Bootstrap 3.3 #918 Change tests to use moment-with-locales.js (momen.js v2.8.x) Checkbox / Radio: Setting checked attribute on underlying input #906 letting native date construct date instead of moment falling back to native date bypasses deprecated warning fix #915 Clarifies logic that chooses how to parse dates with moment. Add moment-with-locales to index.html (refix-firefox-checkbox) fix firefox bug where checkbox appears to not change when clicked because it is checking and then unchecking immediately add support for passing options to datepickers when initializing scheduler Modifiy scheduler end/start dates to pass moment deprecated "lang" for "locale" assign lang to locale for moment js Fix of search when tabbing in --- Gruntfile.js | 15 ++------------- js/search.js | 21 ++++++++++++++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index bc50ebb1b..2e02fcb5e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -228,16 +228,6 @@ module.exports = function(grunt) { } } }, - replace: { - dist: { - src: ['DETAILS.md', 'README.md'], - overwrite: true, // overwrite matched source files - replacements: [{ - from: /fuelux\/\d\.\d\.\d/g, - to: "fuelux/<%= pkg.version %>" - }] - } - }, 'saucelabs-qunit': { trickyBrowsers: { options: { @@ -350,7 +340,6 @@ module.exports = function(grunt) { }); - /* ------------- BUILD ------------- */ @@ -392,8 +381,8 @@ module.exports = function(grunt) { /* ------------- RELEASE ------------- */ - // Maintainers: Run prior to a release. Includes SauceLabs VM tests. Run `grunt bump` first. - grunt.registerTask('release', 'Run full tests, saucelabs, build "dist"', ['releasetest', 'dist', 'replace:dist']); + // Maintainers: Run prior to a release. Includes SauceLabs VM tests. + grunt.registerTask('release', 'Run full tests, saucelabs, build "dist"', ['releasetest', 'dist']); /* ------------- diff --git a/js/search.js b/js/search.js index fb045608b..7107d5317 100644 --- a/js/search.js +++ b/js/search.js @@ -111,12 +111,21 @@ if (e.which === 13) { e.preventDefault(); this.action(); - } else { + } + else if (e.which === 9) { + e.preventDefault(); + } + else { val = this.$input.val(); - if(!val){ - this.clear(); - }else if(val!==this.activeSearch){ + + if(val!==this.activeSearch){ this.$icon.removeClass(remove).addClass(search); + if(val) { + this.$element.removeClass('searched'); + } + else if (this.options.clearOnEmpty){ + this.clear(); + } }else{ this.$icon.removeClass(search).addClass(remove); } @@ -156,7 +165,9 @@ return ( methodReturn === undefined ) ? $set : methodReturn; }; - $.fn.search.defaults = {}; + $.fn.search.defaults = { + clearOnEmpty: false + }; $.fn.search.Constructor = Search; From 78dd9af69914eb7b96a1e9ef6fe882b66e9e9026 Mon Sep 17 00:00:00 2001 From: benjaminneildavis Date: Mon, 5 Jan 2015 15:12:12 -0500 Subject: [PATCH 2/2] Fix of search when tabbing in --- Gruntfile.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 2e02fcb5e..bc50ebb1b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -228,6 +228,16 @@ module.exports = function(grunt) { } } }, + replace: { + dist: { + src: ['DETAILS.md', 'README.md'], + overwrite: true, // overwrite matched source files + replacements: [{ + from: /fuelux\/\d\.\d\.\d/g, + to: "fuelux/<%= pkg.version %>" + }] + } + }, 'saucelabs-qunit': { trickyBrowsers: { options: { @@ -340,6 +350,7 @@ module.exports = function(grunt) { }); + /* ------------- BUILD ------------- */ @@ -381,8 +392,8 @@ module.exports = function(grunt) { /* ------------- RELEASE ------------- */ - // Maintainers: Run prior to a release. Includes SauceLabs VM tests. - grunt.registerTask('release', 'Run full tests, saucelabs, build "dist"', ['releasetest', 'dist']); + // Maintainers: Run prior to a release. Includes SauceLabs VM tests. Run `grunt bump` first. + grunt.registerTask('release', 'Run full tests, saucelabs, build "dist"', ['releasetest', 'dist', 'replace:dist']); /* -------------