Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

es6
guy 8 years ago
parent
9d7628fc0c
commit
26b3daab12
5 changed files with 51 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      bi/widget.js
  2. 23
      docs/widget.js
  3. 8
      src/widget/adaptivearrangement/adaptivearrangement.js
  4. 11
      src/widget/arrangement/arrangement.js
  5. 4
      src/widget/interactivearrangement/interactivearrangement.js

23
bi/widget.js
Unescape View File

@ -475,8 +475,8 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
width: ui.size.width, width: ui.size.width,
height: height height: height
}); });
self.arrangement.scrollTo(height); self.arrangement.scrollTo({top: height});
}, 500); }, 300);
}; };
this.arrangement.container.element.resizable({ this.arrangement.container.element.resizable({
handles: "s", handles: "s",
@ -879,6 +879,10 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
return this.arrangement.setRegionPosition(name, position); return this.arrangement.setRegionPosition(name, position);
}, },
scrollTo: function (scroll) {
this.arrangement.scrollTo(scroll);
},
zoom: function (ratio) { zoom: function (ratio) {
this.arrangement.zoom(ratio); this.arrangement.zoom(ratio);
}, },
@ -1205,7 +1209,8 @@ BI.Arrangement = BI.inherit(BI.Widget, {
findBottomRegions.push(region); findBottomRegions.push(region);
} }
}); });
var topValid = isRegionsValid(findTopRegions, "top"), bottomValid = isRegionsValid(findBottomRegions, "bottom"); var topValid = isRegionsValid(findTopRegions, "top"),
bottomValid = isRegionsValid(findBottomRegions, "bottom");
if (topValid && bottomValid) { if (topValid && bottomValid) {
BI.each(findTopRegions, function (i, region) { BI.each(findTopRegions, function (i, region) {
var clone = BI.clone(region); var clone = BI.clone(region);
@ -1248,7 +1253,8 @@ BI.Arrangement = BI.inherit(BI.Widget, {
findRightRegions.push(region); findRightRegions.push(region);
} }
}); });
var leftValid = isRegionsValid(findLeftRegions, "left"), rightValid = isRegionsValid(findRightRegions, "right"); var leftValid = isRegionsValid(findLeftRegions, "left"),
rightValid = isRegionsValid(findRightRegions, "right");
if (leftValid && rightValid) { if (leftValid && rightValid) {
BI.each(findLeftRegions, function (i, region) { BI.each(findLeftRegions, function (i, region) {
var clone = BI.clone(region); var clone = BI.clone(region);
@ -3679,8 +3685,9 @@ BI.Arrangement = BI.inherit(BI.Widget, {
this.resize(); this.resize();
}, },
scrollTo: function (top) { scrollTo: function (scroll) {
this.scrollContainer.element.scrollTop(top); this.scrollContainer.element.scrollTop(scroll.top);
this.scrollContainer.element.scrollLeft(scroll.left);
}, },
zoom: function (ratio) { zoom: function (ratio) {
@ -7682,6 +7689,10 @@ BI.InteractiveArrangement = BI.inherit(BI.Widget, {
return this.arrangement.setRegionPosition(name, position); return this.arrangement.setRegionPosition(name, position);
}, },
scrollTo: function (scroll) {
this.arrangement.scrollTo(scroll);
},
zoom: function (ratio) { zoom: function (ratio) {
this.arrangement.zoom(ratio); this.arrangement.zoom(ratio);
}, },

23
docs/widget.js
Unescape View File

@ -475,8 +475,8 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
width: ui.size.width, width: ui.size.width,
height: height height: height
}); });
self.arrangement.scrollTo(height); self.arrangement.scrollTo({top: height});
}, 500); }, 300);
}; };
this.arrangement.container.element.resizable({ this.arrangement.container.element.resizable({
handles: "s", handles: "s",
@ -879,6 +879,10 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
return this.arrangement.setRegionPosition(name, position); return this.arrangement.setRegionPosition(name, position);
}, },
scrollTo: function (scroll) {
this.arrangement.scrollTo(scroll);
},
zoom: function (ratio) { zoom: function (ratio) {
this.arrangement.zoom(ratio); this.arrangement.zoom(ratio);
}, },
@ -1205,7 +1209,8 @@ BI.Arrangement = BI.inherit(BI.Widget, {
findBottomRegions.push(region); findBottomRegions.push(region);
} }
}); });
var topValid = isRegionsValid(findTopRegions, "top"), bottomValid = isRegionsValid(findBottomRegions, "bottom"); var topValid = isRegionsValid(findTopRegions, "top"),
bottomValid = isRegionsValid(findBottomRegions, "bottom");
if (topValid && bottomValid) { if (topValid && bottomValid) {
BI.each(findTopRegions, function (i, region) { BI.each(findTopRegions, function (i, region) {
var clone = BI.clone(region); var clone = BI.clone(region);
@ -1248,7 +1253,8 @@ BI.Arrangement = BI.inherit(BI.Widget, {
findRightRegions.push(region); findRightRegions.push(region);
} }
}); });
var leftValid = isRegionsValid(findLeftRegions, "left"), rightValid = isRegionsValid(findRightRegions, "right"); var leftValid = isRegionsValid(findLeftRegions, "left"),
rightValid = isRegionsValid(findRightRegions, "right");
if (leftValid && rightValid) { if (leftValid && rightValid) {
BI.each(findLeftRegions, function (i, region) { BI.each(findLeftRegions, function (i, region) {
var clone = BI.clone(region); var clone = BI.clone(region);
@ -3679,8 +3685,9 @@ BI.Arrangement = BI.inherit(BI.Widget, {
this.resize(); this.resize();
}, },
scrollTo: function (top) { scrollTo: function (scroll) {
this.scrollContainer.element.scrollTop(top); this.scrollContainer.element.scrollTop(scroll.top);
this.scrollContainer.element.scrollLeft(scroll.left);
}, },
zoom: function (ratio) { zoom: function (ratio) {
@ -7682,6 +7689,10 @@ BI.InteractiveArrangement = BI.inherit(BI.Widget, {
return this.arrangement.setRegionPosition(name, position); return this.arrangement.setRegionPosition(name, position);
}, },
scrollTo: function (scroll) {
this.arrangement.scrollTo(scroll);
},
zoom: function (ratio) { zoom: function (ratio) {
this.arrangement.zoom(ratio); this.arrangement.zoom(ratio);
}, },

8
src/widget/adaptivearrangement/adaptivearrangement.js
Unescape View File

@ -56,8 +56,8 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
width: ui.size.width, width: ui.size.width,
height: height height: height
}); });
self.arrangement.scrollTo(height); self.arrangement.scrollTo({top: height});
}, 500); }, 300);
}; };
this.arrangement.container.element.resizable({ this.arrangement.container.element.resizable({
handles: "s", handles: "s",
@ -460,6 +460,10 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
return this.arrangement.setRegionPosition(name, position); return this.arrangement.setRegionPosition(name, position);
}, },
scrollTo: function (scroll) {
this.arrangement.scrollTo(scroll);
},
zoom: function (ratio) { zoom: function (ratio) {
this.arrangement.zoom(ratio); this.arrangement.zoom(ratio);
}, },

11
src/widget/arrangement/arrangement.js
Unescape View File

@ -214,7 +214,8 @@ BI.Arrangement = BI.inherit(BI.Widget, {
findBottomRegions.push(region); findBottomRegions.push(region);
} }
}); });
var topValid = isRegionsValid(findTopRegions, "top"), bottomValid = isRegionsValid(findBottomRegions, "bottom"); var topValid = isRegionsValid(findTopRegions, "top"),
bottomValid = isRegionsValid(findBottomRegions, "bottom");
if (topValid && bottomValid) { if (topValid && bottomValid) {
BI.each(findTopRegions, function (i, region) { BI.each(findTopRegions, function (i, region) {
var clone = BI.clone(region); var clone = BI.clone(region);
@ -257,7 +258,8 @@ BI.Arrangement = BI.inherit(BI.Widget, {
findRightRegions.push(region); findRightRegions.push(region);
} }
}); });
var leftValid = isRegionsValid(findLeftRegions, "left"), rightValid = isRegionsValid(findRightRegions, "right"); var leftValid = isRegionsValid(findLeftRegions, "left"),
rightValid = isRegionsValid(findRightRegions, "right");
if (leftValid && rightValid) { if (leftValid && rightValid) {
BI.each(findLeftRegions, function (i, region) { BI.each(findLeftRegions, function (i, region) {
var clone = BI.clone(region); var clone = BI.clone(region);
@ -2688,8 +2690,9 @@ BI.Arrangement = BI.inherit(BI.Widget, {
this.resize(); this.resize();
}, },
scrollTo: function (top) { scrollTo: function (scroll) {
this.scrollContainer.element.scrollTop(top); this.scrollContainer.element.scrollTop(scroll.top);
this.scrollContainer.element.scrollLeft(scroll.left);
}, },
zoom: function (ratio) { zoom: function (ratio) {

4
src/widget/interactivearrangement/interactivearrangement.js
Unescape View File

@ -525,6 +525,10 @@ BI.InteractiveArrangement = BI.inherit(BI.Widget, {
return this.arrangement.setRegionPosition(name, position); return this.arrangement.setRegionPosition(name, position);
}, },
scrollTo: function (scroll) {
this.arrangement.scrollTo(scroll);
},
zoom: function (ratio) { zoom: function (ratio) {
this.arrangement.zoom(ratio); this.arrangement.zoom(ratio);
}, },

Write Preview
Loading…
Cancel
Save