Skip to content

Commit

Permalink
Bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
rickyleung committed Sep 25, 2015
1 parent 3c7c31b commit 58bca4d
Show file tree
Hide file tree
Showing 15 changed files with 41 additions and 33 deletions.
8 changes: 6 additions & 2 deletions dist/jquery.bizui.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* BizUI Framework
* @version v1.0.4
* @version v1.0.5
* @copyright 2015 Sogou, Inc.
* @link https://github.com/bizdevfe/biz-ui
*/
Expand Down Expand Up @@ -317,7 +317,7 @@
top: 50%;
left: 50%;
box-shadow: 0 0 8px #888;
z-index: 1003;
z-index: 1001;
font-family: "Microsoft Yahei", Helvetica, Arial, sans-serif
}
.biz-dialog-title {
Expand Down Expand Up @@ -362,6 +362,10 @@
opacity: 0.2;
z-index: 1000
}
.biz-alert,
.biz-confirm {
z-index: 1003
}
.biz-panel {
position: absolute;
top: 0;
Expand Down
24 changes: 12 additions & 12 deletions dist/jquery.bizui.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
/**
* BizUI Framework
* @version v1.0.4
* @version v1.0.5
* @copyright 2015 Sogou, Inc.
* @link https://github.com/bizdevfe/biz-ui
*/
(function (root, factory) {
if (typeof define === 'function' && define.amd) {
define([], factory);
define(['jquery'], factory);
} else {
root.bizui = factory();
}
}(this, function () {var requirejs, require, define;
}(this, function($) {var requirejs, require, define;
(function(undef) {
var main, req, makeMap, handlers,
defined = {},
Expand Down Expand Up @@ -1203,6 +1203,7 @@ define('ui/Radio',['require'],function(require) {
}).on('click.bizRadio', function(e) {
if (!self.main.disabled) {
self.$group.bizRadio('uncheck');
self.main.checked = true;
$(this).attr('class', defaultClass + ' ' + checked + ' ' + checkedHover);
}
});
Expand Down Expand Up @@ -2739,6 +2740,7 @@ define('ui/Select',['require','dep/jquery.selectBox'],function(require) {
options = $.extend({}, options || {});

this.instance = new SelectBox($(select), {
mobile: true,
loopOptions: options.loop
});

Expand Down Expand Up @@ -3005,7 +3007,7 @@ define('ui/Dialog',['require'],function(require) {
* @static
*/
Dialog.alert = function(options) {
var alert = $('<div style="display:none" class="bizui-alert" title="' + options.title + '">' + options.content + '</div>');
var alert = $('<div style="display:none" class="biz-alert" title="' + options.title + '">' + options.content + '</div>');
alert.appendTo('body').bizDialog({
width: 360,
height: 200,
Expand Down Expand Up @@ -3033,7 +3035,7 @@ define('ui/Dialog',['require'],function(require) {
* @static
*/
Dialog.confirm = function(options) {
var confirm = $('<div style="display:none" class="bizui-confirm" title="' + options.title + '">' + options.content + '</div>');
var confirm = $('<div style="display:none" class="biz-confirm" title="' + options.title + '">' + options.content + '</div>');
confirm.appendTo('body').bizDialog({
width: 360,
height: 200,
Expand Down Expand Up @@ -3865,15 +3867,13 @@ define('dep/jquery.simplePagination',['require'],function(require) {
o.pages = methods._getPages(o);
this.data('pagination', o);
methods._draw.call(this);
methods._selectPage.call(this, 0);
},

updateItemsOnPage: function(itemsOnPage) {
var o = this.data('pagination');
o.itemsOnPage = itemsOnPage;
o.pages = methods._getPages(o);
this.data('pagination', o);
methods._selectPage.call(this, 0);
return this;
},

Expand Down Expand Up @@ -4116,12 +4116,12 @@ define('ui/Page',['require','dep/jquery.simplePagination'],function(require) {

Page.prototype = {
/**
* 设置每页条数, 同时页码置为1
* 设置每页条数
* @param {Number} pageSize 每页条数
* @fires onPageClick
*/
setPageSize: function(pageSize) {
this.instance.pagination('updateItemsOnPage', pageSize);
this.instance.pagination('drawPage', 1);
},

/**
Expand All @@ -4134,12 +4134,12 @@ define('ui/Page',['require','dep/jquery.simplePagination'],function(require) {
},

/**
* 设置总条数, 同时页码置为1
* 设置总条数
* @param {Number} totalNumber 总条数
* @fires onPageClick
*/
setTotalNumber: function(totalNumber) {
this.instance.pagination('updateItems', totalNumber);
this.instance.pagination('drawPage', 1);
},

/**
Expand Down Expand Up @@ -14156,7 +14156,7 @@ define('bizui',['require','ui/Button','ui/Input','ui/Textarea','ui/Textline','ui
/**
* @property {String} version 版本号
*/
bizui.version = '1.0.4';
bizui.version = '1.0.5';

var origin = window.bizui;

Expand Down
2 changes: 1 addition & 1 deletion dist/jquery.bizui.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/jquery.bizui.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "biz-ui",
"version": "1.0.4",
"version": "1.0.5",
"description": "A jQuery plugin for business UI components",
"keywords": ["jQuery plugin", "Button", "Input", "Textarea", "Radio", "Checkbox", "Select", "Dialog", "Panel", "Tooltip", "Tab", "Page", "Tree", "Calendar", "Table"],
"homepage": "http://bizdevfe.github.io/biz-ui",
Expand Down
2 changes: 1 addition & 1 deletion src/bizui.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ define(function(require) {
/**
* @property {String} version 版本号
*/
bizui.version = '1.0.4';
bizui.version = '1.0.5';

var origin = window.bizui;

Expand Down
6 changes: 5 additions & 1 deletion src/css/dialog.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
top: 50%;
left: 50%;
box-shadow: 0 0 8px #888;
z-index: 1003;
z-index: 1001;
font-family: "Microsoft Yahei", Helvetica, Arial, sans-serif
}
.biz-dialog-title {
Expand Down Expand Up @@ -52,3 +52,7 @@
opacity: 0.2;
z-index: 1000
}
.biz-alert,
.biz-confirm {
z-index: 1003
}
2 changes: 1 addition & 1 deletion src/css/main.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* BizUI Framework
* @version v1.0.4
* @version v1.0.5
* @copyright 2015 Sogou, Inc.
* @link https://github.com/bizdevfe/biz-ui
*/
Expand Down
2 changes: 0 additions & 2 deletions src/dep/jquery.simplePagination.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,13 @@ define(function(require) {
o.pages = methods._getPages(o);
this.data('pagination', o);
methods._draw.call(this);
methods._selectPage.call(this, 0);
},

updateItemsOnPage: function(itemsOnPage) {
var o = this.data('pagination');
o.itemsOnPage = itemsOnPage;
o.pages = methods._getPages(o);
this.data('pagination', o);
methods._selectPage.call(this, 0);
return this;
},

Expand Down
6 changes: 3 additions & 3 deletions src/loader/start.frag
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/**
* BizUI Framework
* @version v1.0.4
* @version v1.0.5
* @copyright 2015 Sogou, Inc.
* @link https://github.com/bizdevfe/biz-ui
*/
(function (root, factory) {
if (typeof define === 'function' && define.amd) {
define([], factory);
define(['jquery'], factory);
} else {
root.bizui = factory();
}
}(this, function () {
}(this, function($) {
4 changes: 2 additions & 2 deletions src/ui/Dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ define(function(require) {
* @static
*/
Dialog.alert = function(options) {
var alert = $('<div style="display:none" class="bizui-alert" title="' + options.title + '">' + options.content + '</div>');
var alert = $('<div style="display:none" class="biz-alert" title="' + options.title + '">' + options.content + '</div>');
alert.appendTo('body').bizDialog({
width: 360,
height: 200,
Expand Down Expand Up @@ -167,7 +167,7 @@ define(function(require) {
* @static
*/
Dialog.confirm = function(options) {
var confirm = $('<div style="display:none" class="bizui-confirm" title="' + options.title + '">' + options.content + '</div>');
var confirm = $('<div style="display:none" class="biz-confirm" title="' + options.title + '">' + options.content + '</div>');
confirm.appendTo('body').bizDialog({
width: 360,
height: 200,
Expand Down
8 changes: 4 additions & 4 deletions src/ui/Page.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ define(function(require) {

Page.prototype = {
/**
* 设置每页条数, 同时页码置为1
* 设置每页条数
* @param {Number} pageSize 每页条数
* @fires onPageClick
*/
setPageSize: function(pageSize) {
this.instance.pagination('updateItemsOnPage', pageSize);
this.instance.pagination('drawPage', 1);
},

/**
Expand All @@ -51,12 +51,12 @@ define(function(require) {
},

/**
* 设置总条数, 同时页码置为1
* 设置总条数
* @param {Number} totalNumber 总条数
* @fires onPageClick
*/
setTotalNumber: function(totalNumber) {
this.instance.pagination('updateItems', totalNumber);
this.instance.pagination('drawPage', 1);
},

/**
Expand Down
1 change: 1 addition & 0 deletions src/ui/Radio.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ define(function(require) {
}).on('click.bizRadio', function(e) {
if (!self.main.disabled) {
self.$group.bizRadio('uncheck');
self.main.checked = true;
$(this).attr('class', defaultClass + ' ' + checked + ' ' + checkedHover);
}
});
Expand Down
1 change: 1 addition & 0 deletions src/ui/Select.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ define(function(require) {
options = $.extend({}, options || {});

this.instance = new SelectBox($(select), {
mobile: true,
loopOptions: options.loop
});

Expand Down
2 changes: 1 addition & 1 deletion tool/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if [ $? -ne 0 ]
fi

#update version
V="1.0.4"
V="1.0.5"
sed -i "s/v[0-9].[0-9].[0-9]/v$V/" "../src/loader/start.frag"
sed -i "s/v[0-9].[0-9].[0-9]/v$V/" "../src/css/main.css"

Expand Down

0 comments on commit 58bca4d

Please sign in to comment.