diff --git a/ChangeLog.txt b/ChangeLog.txt index fb9473c..2ff0cf3 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -3,9 +3,13 @@ jQueryMultipleSelectBox Change Log Version - ==================== .Add isFilterEnabled + +Version 0.8.2 +==================== .Remove getMultipleSelectBoxHistory's isReNew parameter .Add method: clearMultipleSelectBoxHistory and refreshMultipleSelectBox .Fix bug: serialize submit field after initializing +.Issue 2: onSelectChange error Version 0.8.1 ==================== diff --git a/README.md b/README.md index dd805a4..08ccde8 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,9 @@ jQuery Multiple Select Box Plugin Tested with: Android 2+, Chrome 22, Firefox 16, IE 6+, Safari 5 -Demo: https://dl.dropbox.com/u/8316573/index.html -
Download: https://github.com/h920526/jQueryMultipleSelectBox/releases +
+Demo: https://h920526.github.io/jQueryMultipleSelectBox/ See also: ========== diff --git a/build.xml b/build.xml index 9ca639a..8ab0a87 100644 --- a/build.xml +++ b/build.xml @@ -1,50 +1,51 @@ - + - - + + - - + + - - - + + + - - + + - - + + - + - + + @@ -52,7 +53,7 @@ - + - \ No newline at end of file + diff --git a/index.html b/index.html index a7a6dc4..89f3013 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ - + body { margin: 20px 30px 500px 30px; @@ -727,4 +727,4 @@

jQuery })(); - \ No newline at end of file + diff --git a/jQueryMultipleSelectBox.jquery.json b/jQueryMultipleSelectBox.jquery.json index e7670d8..eb6d573 100644 --- a/jQueryMultipleSelectBox.jquery.json +++ b/jQueryMultipleSelectBox.jquery.json @@ -1,6 +1,6 @@ { "name": "jQueryMultipleSelectBox", - "version": "0.8.1", + "version": "0.8.2", "title": "jQueryMultipleSelectBox", "author": { "name": "h920526", diff --git a/js/jquery.multipleselectbox.js b/js/jquery.multipleselectbox.js index 925c52c..8f41aaa 100644 --- a/js/jquery.multipleselectbox.js +++ b/js/jquery.multipleselectbox.js @@ -14,7 +14,6 @@ (function($) { /* static variables */ var PLUGIN_NAMESPACE = "MultipleSelectBox"; - var PLUGIN_FILTER_NAMESPACE = "MultipleSelectBoxFilter"; var PLUGIN_MODE_AUTO = "auto"; var PLUGIN_ATTR_VALUE_RENDER = "value-render"; var PLUGIN_STYLE_HORIZONTAL = "horizontal"; @@ -37,9 +36,6 @@ "isKeyEventEnabled": true, /* form options */ "submitField": null, - /* filter options */ - "isFilterEnabled": true, - "filterField": null, /* callback function */ "onCreate": null, "onSelectStart": null, @@ -123,10 +119,10 @@ * @return jQuery */ "getMultipleSelectBoxSelectedRows": function() { - return $.grep(this.getMultipleSelectBoxCachedRows(), function(row) { + return this.pushStack($.grep(this.getMultipleSelectBoxCachedRows(), function(row) { var $childRow = $(row); return ($childRow.isMultipleSelectBoxRowSelectable() && $childRow.isMultipleSelectBoxRowSelected()); - }); + })); }, /** @@ -788,36 +784,6 @@ }); } - /** - * Private : Initialize MultipleSelectBox Filter - */ - function initializeMultipleSelectBoxFilter($container) { - var options = $container.getMultipleSelectBoxOptions(); - var containerOffset = $container.offset(); - var filterField = options.filterField; - $container.bind("mouseenter." + PLUGIN_FILTER_NAMESPACE, function() { - filterField.removeClass(PLUGIN_STYLE_DISABLED); - }).bind("mouseleave." + PLUGIN_FILTER_NAMESPACE, function() { - filterField.addClass(PLUGIN_STYLE_DISABLED); - }).bind("focus." + PLUGIN_FILTER_NAMESPACE, function() { - filterField.removeClass(PLUGIN_STYLE_DISABLED); - }).bind("blur." + PLUGIN_FILTER_NAMESPACE, function() { - filterField.addClass(PLUGIN_STYLE_DISABLED); - }); - filterField.css({ - "top": containerOffset.top + $container.height() - filterField.outerHeight(), - "left": containerOffset.left + $container.width() - filterField.outerWidth() - scrollBarSize - }).bind("mouseenter." + PLUGIN_FILTER_NAMESPACE, function() { - filterField.removeClass(PLUGIN_STYLE_DISABLED); - }).bind("mouseleave." + PLUGIN_FILTER_NAMESPACE, function() { - filterField.addClass(PLUGIN_STYLE_DISABLED); - }).bind("focus." + PLUGIN_FILTER_NAMESPACE, function() { - filterField.removeClass(PLUGIN_STYLE_DISABLED); - }).bind("blur." + PLUGIN_FILTER_NAMESPACE, function() { - filterField.addClass(PLUGIN_STYLE_DISABLED); - }); - } - function computeMultipleSelectBoxOptions($container, options) { if (options.isTouchDeviceMode == PLUGIN_MODE_AUTO) { options.isTouchDeviceMode = isTouchDevice; @@ -830,15 +796,6 @@ var $submitField = $("input[name=" + originalSubmitField + "]"); options.submitField = ($submitField.length > 0 ? $submitField : $("").insertAfter($container)); } - if (options.isFilterEnabled) { - var filterField = options.filterField; - if (filterField == null) { - filterField = $("
Search:
").insertAfter($container); - } else if (typeof filterField == "string") { - filterField = $("#" + filterField); - } - options.filterField = filterField; - } $container.data("options", options); } @@ -863,9 +820,6 @@ }); /* touch scroll supported for ios5+ only */ /* $container.css("-webkit-overflow-scrolling", "touch"); */ - if (options.isFilterEnabled) { - options.filterField.addClass(PLUGIN_FILTER_NAMESPACE + " " + PLUGIN_STYLE_DISABLED); - } } function initializeMultipleSelectBoxCallbackFunctions($container, options) { @@ -903,10 +857,6 @@ if (options.isTouchDeviceMode) { initializeMultipleSelectBoxTouchEvent($container); } - /* search helper */ - if (options.isFilterEnabled) { - initializeMultipleSelectBoxFilter($container); - } /* reset the field value */ if (options.submitField != null) { options.submitField.val($container.serializeMultipleSelectBox()); diff --git a/multipleselectbox.css b/multipleselectbox.css index 7374111..b0156d3 100644 --- a/multipleselectbox.css +++ b/multipleselectbox.css @@ -77,31 +77,6 @@ z-index: 1; } -/* filter */ -.MultipleSelectBoxFilter { - background-color: white; - padding: 3px 5px 2px 5px; - position: absolute; - z-index: 1; - /* corner */ - -moz-border-radius: 5px; - -khtml-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; - -moz-box-shadow: 0 0 5px #888; - -webkit-box-shadow: 0 0 5px #888; - box-shadow: 0 0 5px #888; -} - -.MultipleSelectBoxFilter input { - border: none; - border-bottom: 1px solid gray; -} - -.MultipleSelectBoxFilter.disabled { - display: none; -} - /* Ultimate CSS Gradient Generator (Orange 3D) */ .MultipleSelectBox li.selected { background: #ffa84c;