Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jquerySexyCombo/jquery.sexy-combo.js
===================================================================
diff -u -r25245 -r25733
--- ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jquerySexyCombo/jquery.sexy-combo.js (.../jquery.sexy-combo.js) (revision 25245)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jquerySexyCombo/jquery.sexy-combo.js (.../jquery.sexy-combo.js) (revision 25733)
@@ -142,7 +142,7 @@
// annie
$(this._config.container).find('.totalPage').text(((this._config.ajaxData.start/this._config.ajaxData.limit)+1));
$(this._config.container).find('.totalAll').text((config.totalPage));
- $(this._config.container).find('.pagesall').text(config.total);
+ $(this._config.container).find('.pagesall').text("共"+config.total+"条");
/*Annie*/
var self = this;
@@ -240,7 +240,7 @@
var self = this;
//下一页
this.nextPage.bind('click',function (e) {
- // console.log()
+
var totalPage = $(self._config.container).find('.totalAll').text();//总页数
if(self._config.ajaxData.currentPage>=totalPage){
e.stopPropagation();
@@ -364,7 +364,6 @@
$sc.create(self._config);
btnIsFirst =false;
}
- // return false;
}else{
self.eliminate();
$(this).val('1');
@@ -404,8 +403,6 @@
self.icon.trigger("click");
});
-
- //here
this.wrapper.bind("click", function() {
self.wrapper.data("sc:lastEvent", "click");
});
@@ -600,14 +597,12 @@
this.notify("hideList");
},
- //returns sum of all visible items height
getListItemsHeight: function() {
var itemHeight = this.singleItemHeight;
return itemHeight * this.liLen();
},
- //changes list wrapper's overflow from hidden to scroll and vice versa (depending on list items height))
setOverflow: function() {
var maxHeight = this.getListMaxHeight();
@@ -617,7 +612,6 @@
this.listWrapper.css(this.overflowCSS, "hidden");
},
- //highlights active item of the dropdown list
highlight: function(activeItem) {
if (($sc.KEY.DOWN == this.lastKey) || ($sc.KEY.UP == this.lastKey))
return;
@@ -875,8 +869,8 @@
selft._config.ajaxData.start=parseInt((selft._config.ajaxData.currentPage*selft._config.ajaxData.limit)-selft._config.ajaxData.limit);
$sc.create(selft._config)
selft.showList();
- // $('.list-page').removeClass('invisible').addClass('visible')
$(selft._config.container).find('.list-page').removeClass('invisible').addClass('visible');
+ $('.inputAll').val(1)
btnIsFirst =false;
}
@@ -1129,9 +1123,10 @@
var data = config.data;
var selected = false;
-
+ $("").appendTo($selectbox).attr("value", '').text('').attr("selected", selected);
for (var i = 0, len = data.length; i < len; ++i) {
selected = data[i].selected || false;
+ selected = data[i].selected || false;
$("").appendTo($selectbox).
attr("value", data[i][config.key]).
text(data[i][config.value]).