guy 8 years ago
parent
commit
c774adafec
  1. 1057
      bi/core.js
  2. 31
      bi/widget.js
  3. 1057
      dist/core.js
  4. 31
      dist/widget.js
  5. 1052
      src/core/alias.js
  6. 31
      src/widget/adaptivearrangement/adaptivearrangement.js

1057
bi/core.js

File diff suppressed because it is too large Load Diff

31
bi/widget.js

@ -419,8 +419,10 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
if (o.isNeedResizeContainer) { if (o.isNeedResizeContainer) {
var isResizing = false; var isResizing = false;
var needEnd = false;
var height; var height;
var interval; var interval;
var startSize;
var resize = function (e, ui) { var resize = function (e, ui) {
if (isResizing) { if (isResizing) {
return; return;
@ -442,20 +444,26 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
minHeight: 20, minHeight: 20,
helper: "bi-resizer", helper: "bi-resizer",
autoHide: true, autoHide: true,
start: function (e, ui) {
startSize = BI.clone(ui.size);
},
resize: function (e, ui) { resize: function (e, ui) {
if (ui.size.height >= self.arrangement.container.element.height()) { if (ui.size.height >= startSize.height - 10) {
resize(e, ui); resize(e, ui);
} else { } else {
interval && clearInterval(interval); interval && clearInterval(interval);
needEnd = true;
} }
}, },
stop: function (e, ui) { stop: function (e, ui) {
var size = ui.size; var size = ui.size;
if (isResizing) { if (isResizing && !needEnd) {
size.height = height; size.height = height;
} }
self.arrangement.setContainerSize(ui.size); self.arrangement.setContainerSize(ui.size);
needEnd = false;
isResizing = false; isResizing = false;
startSize = null;
interval && clearInterval(interval); interval && clearInterval(interval);
self.fireEvent(BI.AdaptiveArrangement.EVENT_RESIZE); self.fireEvent(BI.AdaptiveArrangement.EVENT_RESIZE);
} }
@ -484,17 +492,21 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
return this.arrangement._isEqual.apply(this.arrangement, arguments); return this.arrangement._isEqual.apply(this.arrangement, arguments);
}, },
_setSelect: function (item) {
if (!item.element.hasClass("selected")) {
item.element.css("zIndex", ++this.zIndex);
BI.each(this.getAllRegions(), function (i, region) {
region.el.element.removeClass("selected");
});
item.element.addClass("selected");
}
},
_initResizable: function (item) { _initResizable: function (item) {
var self = this, o = this.options; var self = this, o = this.options;
item.element.css("zIndex", ++this.zIndex); item.element.css("zIndex", ++this.zIndex);
item.element.mousedown(function () { item.element.mousedown(function () {
if (!item.element.hasClass("selected")) { self._setSelect(item)
item.element.css("zIndex", ++self.zIndex);
BI.each(self.getAllRegions(), function (i, region) {
region.el.element.removeClass("selected");
});
item.element.addClass("selected");
}
}); });
o.resizable && item.element.resizable({ o.resizable && item.element.resizable({
handles: "e, s, se", handles: "e, s, se",
@ -663,6 +675,7 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
addRegion: function (region, position) { addRegion: function (region, position) {
this._initResizable(region.el); this._initResizable(region.el);
this._setSelect(region.el);
var self = this, flag; var self = this, flag;
var old = this.arrangement.getAllRegions(); var old = this.arrangement.getAllRegions();
if (BI.isNotNull(this.position)) { if (BI.isNotNull(this.position)) {

1057
dist/core.js vendored

File diff suppressed because it is too large Load Diff

31
dist/widget.js vendored

@ -419,8 +419,10 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
if (o.isNeedResizeContainer) { if (o.isNeedResizeContainer) {
var isResizing = false; var isResizing = false;
var needEnd = false;
var height; var height;
var interval; var interval;
var startSize;
var resize = function (e, ui) { var resize = function (e, ui) {
if (isResizing) { if (isResizing) {
return; return;
@ -442,20 +444,26 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
minHeight: 20, minHeight: 20,
helper: "bi-resizer", helper: "bi-resizer",
autoHide: true, autoHide: true,
start: function (e, ui) {
startSize = BI.clone(ui.size);
},
resize: function (e, ui) { resize: function (e, ui) {
if (ui.size.height >= self.arrangement.container.element.height()) { if (ui.size.height >= startSize.height - 10) {
resize(e, ui); resize(e, ui);
} else { } else {
interval && clearInterval(interval); interval && clearInterval(interval);
needEnd = true;
} }
}, },
stop: function (e, ui) { stop: function (e, ui) {
var size = ui.size; var size = ui.size;
if (isResizing) { if (isResizing && !needEnd) {
size.height = height; size.height = height;
} }
self.arrangement.setContainerSize(ui.size); self.arrangement.setContainerSize(ui.size);
needEnd = false;
isResizing = false; isResizing = false;
startSize = null;
interval && clearInterval(interval); interval && clearInterval(interval);
self.fireEvent(BI.AdaptiveArrangement.EVENT_RESIZE); self.fireEvent(BI.AdaptiveArrangement.EVENT_RESIZE);
} }
@ -484,17 +492,21 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
return this.arrangement._isEqual.apply(this.arrangement, arguments); return this.arrangement._isEqual.apply(this.arrangement, arguments);
}, },
_setSelect: function (item) {
if (!item.element.hasClass("selected")) {
item.element.css("zIndex", ++this.zIndex);
BI.each(this.getAllRegions(), function (i, region) {
region.el.element.removeClass("selected");
});
item.element.addClass("selected");
}
},
_initResizable: function (item) { _initResizable: function (item) {
var self = this, o = this.options; var self = this, o = this.options;
item.element.css("zIndex", ++this.zIndex); item.element.css("zIndex", ++this.zIndex);
item.element.mousedown(function () { item.element.mousedown(function () {
if (!item.element.hasClass("selected")) { self._setSelect(item)
item.element.css("zIndex", ++self.zIndex);
BI.each(self.getAllRegions(), function (i, region) {
region.el.element.removeClass("selected");
});
item.element.addClass("selected");
}
}); });
o.resizable && item.element.resizable({ o.resizable && item.element.resizable({
handles: "e, s, se", handles: "e, s, se",
@ -663,6 +675,7 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
addRegion: function (region, position) { addRegion: function (region, position) {
this._initResizable(region.el); this._initResizable(region.el);
this._setSelect(region.el);
var self = this, flag; var self = this, flag;
var old = this.arrangement.getAllRegions(); var old = this.arrangement.getAllRegions();
if (BI.isNotNull(this.position)) { if (BI.isNotNull(this.position)) {

1052
src/core/alias.js

File diff suppressed because it is too large Load Diff

31
src/widget/adaptivearrangement/adaptivearrangement.js

@ -37,8 +37,10 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
if (o.isNeedResizeContainer) { if (o.isNeedResizeContainer) {
var isResizing = false; var isResizing = false;
var needEnd = false;
var height; var height;
var interval; var interval;
var startSize;
var resize = function (e, ui) { var resize = function (e, ui) {
if (isResizing) { if (isResizing) {
return; return;
@ -60,20 +62,26 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
minHeight: 20, minHeight: 20,
helper: "bi-resizer", helper: "bi-resizer",
autoHide: true, autoHide: true,
start: function (e, ui) {
startSize = BI.clone(ui.size);
},
resize: function (e, ui) { resize: function (e, ui) {
if (ui.size.height >= self.arrangement.container.element.height()) { if (ui.size.height >= startSize.height - 10) {
resize(e, ui); resize(e, ui);
} else { } else {
interval && clearInterval(interval); interval && clearInterval(interval);
needEnd = true;
} }
}, },
stop: function (e, ui) { stop: function (e, ui) {
var size = ui.size; var size = ui.size;
if (isResizing) { if (isResizing && !needEnd) {
size.height = height; size.height = height;
} }
self.arrangement.setContainerSize(ui.size); self.arrangement.setContainerSize(ui.size);
needEnd = false;
isResizing = false; isResizing = false;
startSize = null;
interval && clearInterval(interval); interval && clearInterval(interval);
self.fireEvent(BI.AdaptiveArrangement.EVENT_RESIZE); self.fireEvent(BI.AdaptiveArrangement.EVENT_RESIZE);
} }
@ -102,17 +110,21 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
return this.arrangement._isEqual.apply(this.arrangement, arguments); return this.arrangement._isEqual.apply(this.arrangement, arguments);
}, },
_setSelect: function (item) {
if (!item.element.hasClass("selected")) {
item.element.css("zIndex", ++this.zIndex);
BI.each(this.getAllRegions(), function (i, region) {
region.el.element.removeClass("selected");
});
item.element.addClass("selected");
}
},
_initResizable: function (item) { _initResizable: function (item) {
var self = this, o = this.options; var self = this, o = this.options;
item.element.css("zIndex", ++this.zIndex); item.element.css("zIndex", ++this.zIndex);
item.element.mousedown(function () { item.element.mousedown(function () {
if (!item.element.hasClass("selected")) { self._setSelect(item)
item.element.css("zIndex", ++self.zIndex);
BI.each(self.getAllRegions(), function (i, region) {
region.el.element.removeClass("selected");
});
item.element.addClass("selected");
}
}); });
o.resizable && item.element.resizable({ o.resizable && item.element.resizable({
handles: "e, s, se", handles: "e, s, se",
@ -281,6 +293,7 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
addRegion: function (region, position) { addRegion: function (region, position) {
this._initResizable(region.el); this._initResizable(region.el);
this._setSelect(region.el);
var self = this, flag; var self = this, flag;
var old = this.arrangement.getAllRegions(); var old = this.arrangement.getAllRegions();
if (BI.isNotNull(this.position)) { if (BI.isNotNull(this.position)) {

Loading…
Cancel
Save