fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/~windy/fineui

es6
windy 7 years ago
parent
7e19cd2263 44212a7cb9
commit
68c8eed376
13 changed files with 68 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      dist/bundle.js
  2. 3
      dist/case.js
  3. 30
      dist/core.js
  4. 37
      dist/fineui.js
  5. 4
      dist/fix/fix.compact.js
  6. 3
      src/case/trigger/trigger.icon.text.js
  7. 2
      src/core/wrapper/layout/layout.card.js
  8. 6
      src/core/wrapper/layout/layout.grid.js
  9. 4
      src/core/wrapper/layout/layout.tape.js
  10. 4
      src/core/wrapper/layout/middle/middle.center.js
  11. 4
      src/core/wrapper/layout/middle/middle.float.center.js
  12. 6
      src/core/wrapper/layout/middle/middle.horizontal.js
  13. 4
      src/core/wrapper/layout/middle/middle.vertical.js

33
dist/bundle.js vendored
Unescape View File

@ -23901,7 +23901,7 @@ BI.CardLayout = BI.inherit(BI.Layout, {
BI.each(items, function (i, item) {
if (item) {
if (!self.hasWidget(item.cardName)) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.on(BI.Events.DESTROY, function () {
var index = BI.findIndex(o.items, function (i, tItem) {
return tItem.cardName == item.cardName;
@ -24490,7 +24490,7 @@ BI.GridLayout = BI.inherit(BI.Layout, {
},
stroke: function (items) {
var o = this.options;
var self = this, o = this.options;
var rows = o.rows || o.items.length, columns = o.columns || ((o.items[0] && o.items[0].length) | 0);
var width = 100 / columns, height = 100 / rows;
var els = [];
@ -24537,11 +24537,11 @@ BI.GridLayout = BI.inherit(BI.Layout, {
BI.each(items, function (i, item) {
if (BI.isArray(item)) {
BI.each(item, function (j, el) {
els[i][j] = BI.createWidget(el, this);
els[i][j] = BI.createWidget(el, self);
});
return;
}
els[item.row][item.column] = BI.createWidget(item, this);
els[item.row][item.column] = BI.createWidget(item, self);
});
for (var i = 0; i < rows; i++) {
for (var j = 0; j < columns; j++) {
@ -24997,7 +24997,7 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
items = BI.compact(items);
BI.each(items, function (i, item) {
if (!self.hasWidget(self.getName() + i + "")) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
self.addWidget(self.getName() + i + "", w);
} else {
w = self.getWidgetByName(self.getName() + i + "");
@ -25102,7 +25102,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
items = BI.compact(items);
BI.each(items, function (i, item) {
if (!self.hasWidget(self.getName() + i + "")) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
self.addWidget(self.getName() + i + "", w);
} else {
w = self.getWidgetByName(self.getName() + i + "");
@ -25598,12 +25598,12 @@ BI.CenterLayout = BI.inherit(BI.Layout, {
el: BI.createWidget({
type: "bi.default",
cls: "center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")
}, this)
}, self)
});
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,
@ -25667,7 +25667,7 @@ BI.FloatCenterLayout = BI.inherit(BI.Layout, {
BI.each(items, function (i) {
var widget = BI.createWidget({
type: "bi.default"
}, this);
}, self);
widget.element.addClass("center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")).css({
width: width + "%",
height: "100%"
@ -25678,7 +25678,7 @@ BI.FloatCenterLayout = BI.inherit(BI.Layout, {
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,
@ -25735,7 +25735,7 @@ BI.HorizontalCenterLayout = BI.inherit(BI.Layout, {
},
stroke: function (items) {
var o = this.options;
var self = this, o = this.options;
var list = [];
BI.each(items, function (i) {
list.push({
@ -25744,12 +25744,12 @@ BI.HorizontalCenterLayout = BI.inherit(BI.Layout, {
el: BI.createWidget({
type: "bi.default",
cls: "center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")
}, this)
}, self)
});
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,
@ -25816,12 +25816,12 @@ BI.VerticalCenterLayout = BI.inherit(BI.Layout, {
el: BI.createWidget({
type: "bi.default",
cls: "center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")
}, this)
}, self)
});
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,
@ -76077,9 +76077,6 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
textAlign: "left",
height: o.height,
text: o.text,
title: function () {
return o.text;
},
hgap: c.hgap
});
this.trigerButton = BI.createWidget({

3
dist/case.js vendored
Unescape View File

@ -13740,9 +13740,6 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
textAlign: "left",
height: o.height,
text: o.text,
title: function () {
return o.text;
},
hgap: c.hgap
});
this.trigerButton = BI.createWidget({

30
dist/core.js vendored
Unescape View File

@ -23901,7 +23901,7 @@ BI.CardLayout = BI.inherit(BI.Layout, {
BI.each(items, function (i, item) {
if (item) {
if (!self.hasWidget(item.cardName)) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.on(BI.Events.DESTROY, function () {
var index = BI.findIndex(o.items, function (i, tItem) {
return tItem.cardName == item.cardName;
@ -24490,7 +24490,7 @@ BI.GridLayout = BI.inherit(BI.Layout, {
},
stroke: function (items) {
var o = this.options;
var self = this, o = this.options;
var rows = o.rows || o.items.length, columns = o.columns || ((o.items[0] && o.items[0].length) | 0);
var width = 100 / columns, height = 100 / rows;
var els = [];
@ -24537,11 +24537,11 @@ BI.GridLayout = BI.inherit(BI.Layout, {
BI.each(items, function (i, item) {
if (BI.isArray(item)) {
BI.each(item, function (j, el) {
els[i][j] = BI.createWidget(el, this);
els[i][j] = BI.createWidget(el, self);
});
return;
}
els[item.row][item.column] = BI.createWidget(item, this);
els[item.row][item.column] = BI.createWidget(item, self);
});
for (var i = 0; i < rows; i++) {
for (var j = 0; j < columns; j++) {
@ -24997,7 +24997,7 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
items = BI.compact(items);
BI.each(items, function (i, item) {
if (!self.hasWidget(self.getName() + i + "")) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
self.addWidget(self.getName() + i + "", w);
} else {
w = self.getWidgetByName(self.getName() + i + "");
@ -25102,7 +25102,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
items = BI.compact(items);
BI.each(items, function (i, item) {
if (!self.hasWidget(self.getName() + i + "")) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
self.addWidget(self.getName() + i + "", w);
} else {
w = self.getWidgetByName(self.getName() + i + "");
@ -25598,12 +25598,12 @@ BI.CenterLayout = BI.inherit(BI.Layout, {
el: BI.createWidget({
type: "bi.default",
cls: "center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")
}, this)
}, self)
});
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,
@ -25667,7 +25667,7 @@ BI.FloatCenterLayout = BI.inherit(BI.Layout, {
BI.each(items, function (i) {
var widget = BI.createWidget({
type: "bi.default"
}, this);
}, self);
widget.element.addClass("center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")).css({
width: width + "%",
height: "100%"
@ -25678,7 +25678,7 @@ BI.FloatCenterLayout = BI.inherit(BI.Layout, {
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,
@ -25735,7 +25735,7 @@ BI.HorizontalCenterLayout = BI.inherit(BI.Layout, {
},
stroke: function (items) {
var o = this.options;
var self = this, o = this.options;
var list = [];
BI.each(items, function (i) {
list.push({
@ -25744,12 +25744,12 @@ BI.HorizontalCenterLayout = BI.inherit(BI.Layout, {
el: BI.createWidget({
type: "bi.default",
cls: "center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")
}, this)
}, self)
});
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,
@ -25816,12 +25816,12 @@ BI.VerticalCenterLayout = BI.inherit(BI.Layout, {
el: BI.createWidget({
type: "bi.default",
cls: "center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")
}, this)
}, self)
});
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,

37
dist/fineui.js vendored
Unescape View File

@ -24074,7 +24074,7 @@ BI.CardLayout = BI.inherit(BI.Layout, {
BI.each(items, function (i, item) {
if (item) {
if (!self.hasWidget(item.cardName)) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.on(BI.Events.DESTROY, function () {
var index = BI.findIndex(o.items, function (i, tItem) {
return tItem.cardName == item.cardName;
@ -24663,7 +24663,7 @@ BI.GridLayout = BI.inherit(BI.Layout, {
},
stroke: function (items) {
var o = this.options;
var self = this, o = this.options;
var rows = o.rows || o.items.length, columns = o.columns || ((o.items[0] && o.items[0].length) | 0);
var width = 100 / columns, height = 100 / rows;
var els = [];
@ -24710,11 +24710,11 @@ BI.GridLayout = BI.inherit(BI.Layout, {
BI.each(items, function (i, item) {
if (BI.isArray(item)) {
BI.each(item, function (j, el) {
els[i][j] = BI.createWidget(el, this);
els[i][j] = BI.createWidget(el, self);
});
return;
}
els[item.row][item.column] = BI.createWidget(item, this);
els[item.row][item.column] = BI.createWidget(item, self);
});
for (var i = 0; i < rows; i++) {
for (var j = 0; j < columns; j++) {
@ -25170,7 +25170,7 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
items = BI.compact(items);
BI.each(items, function (i, item) {
if (!self.hasWidget(self.getName() + i + "")) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
self.addWidget(self.getName() + i + "", w);
} else {
w = self.getWidgetByName(self.getName() + i + "");
@ -25275,7 +25275,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
items = BI.compact(items);
BI.each(items, function (i, item) {
if (!self.hasWidget(self.getName() + i + "")) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
self.addWidget(self.getName() + i + "", w);
} else {
w = self.getWidgetByName(self.getName() + i + "");
@ -25771,12 +25771,12 @@ BI.CenterLayout = BI.inherit(BI.Layout, {
el: BI.createWidget({
type: "bi.default",
cls: "center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")
}, this)
}, self)
});
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,
@ -25840,7 +25840,7 @@ BI.FloatCenterLayout = BI.inherit(BI.Layout, {
BI.each(items, function (i) {
var widget = BI.createWidget({
type: "bi.default"
}, this);
}, self);
widget.element.addClass("center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")).css({
width: width + "%",
height: "100%"
@ -25851,7 +25851,7 @@ BI.FloatCenterLayout = BI.inherit(BI.Layout, {
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,
@ -25908,7 +25908,7 @@ BI.HorizontalCenterLayout = BI.inherit(BI.Layout, {
},
stroke: function (items) {
var o = this.options;
var self = this, o = this.options;
var list = [];
BI.each(items, function (i) {
list.push({
@ -25917,12 +25917,12 @@ BI.HorizontalCenterLayout = BI.inherit(BI.Layout, {
el: BI.createWidget({
type: "bi.default",
cls: "center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")
}, this)
}, self)
});
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,
@ -25989,12 +25989,12 @@ BI.VerticalCenterLayout = BI.inherit(BI.Layout, {
el: BI.createWidget({
type: "bi.default",
cls: "center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")
}, this)
}, self)
});
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,
@ -27553,10 +27553,14 @@ Data.Source = BISource = {
var _render = BI.Widget.prototype._render;
BI.Widget.prototype._render = function () {
var needPop = false;
if (window.Fix && this._store) {
needPop = true;
pushTarget(this.store);
initWatch(this, this.watch);
}
_render.apply(this, arguments);
needPop && popTarget();
};
var unMount = BI.Widget.prototype.__d;
@ -77799,9 +77803,6 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
textAlign: "left",
height: o.height,
text: o.text,
title: function () {
return o.text;
},
hgap: c.hgap
});
this.trigerButton = BI.createWidget({

4
dist/fix/fix.compact.js vendored
Unescape View File

@ -116,10 +116,14 @@
var _render = BI.Widget.prototype._render;
BI.Widget.prototype._render = function () {
var needPop = false;
if (window.Fix && this._store) {
needPop = true;
pushTarget(this.store);
initWatch(this, this.watch);
}
_render.apply(this, arguments);
needPop && popTarget();
};
var unMount = BI.Widget.prototype.__d;

3
src/case/trigger/trigger.icon.text.js
Unescape View File

@ -26,9 +26,6 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
textAlign: "left",
height: o.height,
text: o.text,
title: function () {
return o.text;
},
hgap: c.hgap
});
this.trigerButton = BI.createWidget({

2
src/core/wrapper/layout/layout.card.js
Unescape View File

@ -28,7 +28,7 @@ BI.CardLayout = BI.inherit(BI.Layout, {
BI.each(items, function (i, item) {
if (item) {
if (!self.hasWidget(item.cardName)) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.on(BI.Events.DESTROY, function () {
var index = BI.findIndex(o.items, function (i, tItem) {
return tItem.cardName == item.cardName;

6
src/core/wrapper/layout/layout.grid.js
Unescape View File

@ -45,7 +45,7 @@ BI.GridLayout = BI.inherit(BI.Layout, {
},
stroke: function (items) {
var o = this.options;
var self = this, o = this.options;
var rows = o.rows || o.items.length, columns = o.columns || ((o.items[0] && o.items[0].length) | 0);
var width = 100 / columns, height = 100 / rows;
var els = [];
@ -92,11 +92,11 @@ BI.GridLayout = BI.inherit(BI.Layout, {
BI.each(items, function (i, item) {
if (BI.isArray(item)) {
BI.each(item, function (j, el) {
els[i][j] = BI.createWidget(el, this);
els[i][j] = BI.createWidget(el, self);
});
return;
}
els[item.row][item.column] = BI.createWidget(item, this);
els[item.row][item.column] = BI.createWidget(item, self);
});
for (var i = 0; i < rows; i++) {
for (var j = 0; j < columns; j++) {

4
src/core/wrapper/layout/layout.tape.js
Unescape View File

@ -47,7 +47,7 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
items = BI.compact(items);
BI.each(items, function (i, item) {
if (!self.hasWidget(self.getName() + i + "")) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
self.addWidget(self.getName() + i + "", w);
} else {
w = self.getWidgetByName(self.getName() + i + "");
@ -152,7 +152,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
items = BI.compact(items);
BI.each(items, function (i, item) {
if (!self.hasWidget(self.getName() + i + "")) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
self.addWidget(self.getName() + i + "", w);
} else {
w = self.getWidgetByName(self.getName() + i + "");

4
src/core/wrapper/layout/middle/middle.center.js
Unescape View File

@ -40,12 +40,12 @@ BI.CenterLayout = BI.inherit(BI.Layout, {
el: BI.createWidget({
type: "bi.default",
cls: "center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")
}, this)
}, self)
});
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,

4
src/core/wrapper/layout/middle/middle.float.center.js
Unescape View File

@ -35,7 +35,7 @@ BI.FloatCenterLayout = BI.inherit(BI.Layout, {
BI.each(items, function (i) {
var widget = BI.createWidget({
type: "bi.default"
}, this);
}, self);
widget.element.addClass("center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")).css({
width: width + "%",
height: "100%"
@ -46,7 +46,7 @@ BI.FloatCenterLayout = BI.inherit(BI.Layout, {
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,

6
src/core/wrapper/layout/middle/middle.horizontal.js
Unescape View File

@ -30,7 +30,7 @@ BI.HorizontalCenterLayout = BI.inherit(BI.Layout, {
},
stroke: function (items) {
var o = this.options;
var self = this, o = this.options;
var list = [];
BI.each(items, function (i) {
list.push({
@ -39,12 +39,12 @@ BI.HorizontalCenterLayout = BI.inherit(BI.Layout, {
el: BI.createWidget({
type: "bi.default",
cls: "center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")
}, this)
}, self)
});
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,

4
src/core/wrapper/layout/middle/middle.vertical.js
Unescape View File

@ -39,12 +39,12 @@ BI.VerticalCenterLayout = BI.inherit(BI.Layout, {
el: BI.createWidget({
type: "bi.default",
cls: "center-element " + (i === 0 ? "first-element " : "") + (i === items.length - 1 ? "last-element" : "")
}, this)
}, self)
});
});
BI.each(items, function (i, item) {
if (item) {
var w = BI.createWidget(item, this);
var w = BI.createWidget(item, self);
w.element.css({
position: "absolute",
left: o.hgap + o.lgap,

Write Preview
Loading…
Cancel
Save