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

Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~windy/fineui 

# Conflicts:
#	dist/bundle.js
#	dist/bundle.min.js
#	dist/fineui.js
#	dist/fineui.min.js
#	dist/utils.min.js
#	dist/widget.js
es6
windy 6 years ago
parent
4628ba7a0f 8fc9ae7f05
commit
8c5beb6d32
5 changed files with 68 additions and 60 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. 40
      dist/core.js
  2. 42
      dist/fineui_without_jquery_polyfill.js
  3. 3
      dist/utils.js
  4. 3
      public/js/fineui.i18n.js
  5. 40
      src/core/listener/listener.show.js

40
dist/core.js vendored
Unescape View File

@ -18554,26 +18554,28 @@ BI.ShowListener = BI.inherit(BI.OB, {
_init: function () {
BI.ShowListener.superclass._init.apply(this, arguments);
var self = this, o = this.options;
o.eventObj.on(BI.Controller.EVENT_CHANGE, function (type, v, ob) {
if (type === BI.Events.CLICK) {
v = v || o.eventObj.getValue();
v = BI.isArray(v) ? (v.length > 1 ? v.toString() : v[0]) : v;
if (BI.isNull(v)) {
throw new Error("value cannot be null");
}
var cardName = o.cardNameCreator(v);
if (!o.cardLayout.isCardExisted(cardName)) {
var card = o.cardCreator(cardName);
o.cardLayout.addCardByName(cardName, card);
o.afterCardCreated(cardName);
if (o.eventObj) {
o.eventObj.on(BI.Controller.EVENT_CHANGE, function (type, v, ob) {
if (type === BI.Events.CLICK) {
v = v || o.eventObj.getValue();
v = BI.isArray(v) ? (v.length > 1 ? v.toString() : v[0]) : v;
if (BI.isNull(v)) {
throw new Error("value cannot be null");
}
var cardName = o.cardNameCreator(v);
if (!o.cardLayout.isCardExisted(cardName)) {
var card = o.cardCreator(cardName);
o.cardLayout.addCardByName(cardName, card);
o.afterCardCreated(cardName);
}
o.cardLayout.showCardByName(cardName);
BI.nextTick(function () {
o.afterCardShow(cardName);
self.fireEvent(BI.ShowListener.EVENT_CHANGE, cardName);
});
}
o.cardLayout.showCardByName(cardName);
BI.nextTick(function () {
o.afterCardShow(cardName);
self.fireEvent(BI.ShowListener.EVENT_CHANGE, cardName);
});
}
});
});
}
}
});
BI.ShowListener.EVENT_CHANGE = "ShowListener.EVENT_CHANGE";/**

42
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -18300,26 +18300,28 @@ BI.ShowListener = BI.inherit(BI.OB, {
_init: function () {
BI.ShowListener.superclass._init.apply(this, arguments);
var self = this, o = this.options;
o.eventObj.on(BI.Controller.EVENT_CHANGE, function (type, v, ob) {
if (type === BI.Events.CLICK) {
v = v || o.eventObj.getValue();
v = BI.isArray(v) ? (v.length > 1 ? v.toString() : v[0]) : v;
if (BI.isNull(v)) {
throw new Error("value cannot be null");
}
var cardName = o.cardNameCreator(v);
if (!o.cardLayout.isCardExisted(cardName)) {
var card = o.cardCreator(cardName);
o.cardLayout.addCardByName(cardName, card);
o.afterCardCreated(cardName);
}
o.cardLayout.showCardByName(cardName);
BI.nextTick(function () {
o.afterCardShow(cardName);
self.fireEvent(BI.ShowListener.EVENT_CHANGE, cardName);
});
}
});
if (o.eventObj) {
o.eventObj.on(BI.Controller.EVENT_CHANGE, function (type, v, ob) {
if (type === BI.Events.CLICK) {
v = v || o.eventObj.getValue();
v = BI.isArray(v) ? (v.length > 1 ? v.toString() : v[0]) : v;
if (BI.isNull(v)) {
throw new Error("value cannot be null");
}
var cardName = o.cardNameCreator(v);
if (!o.cardLayout.isCardExisted(cardName)) {
var card = o.cardCreator(cardName);
o.cardLayout.addCardByName(cardName, card);
o.afterCardCreated(cardName);
}
o.cardLayout.showCardByName(cardName);
BI.nextTick(function () {
o.afterCardShow(cardName);
self.fireEvent(BI.ShowListener.EVENT_CHANGE, cardName);
});
}
});
}
}
});
BI.ShowListener.EVENT_CHANGE = "ShowListener.EVENT_CHANGE";/**

3
dist/utils.js vendored
Unescape View File

@ -15906,7 +15906,8 @@ BI.Date._OFFSET = [0, -1, -2, -3, -4, -5, -6];BI.i18n = {
"BI-Basic_Minute": "分",
"BI-Basic_Wan": "万",
"BI-Basic_Million": "百万",
"BI-Basic_Billion": "亿"
"BI-Basic_Billion": "亿",
"BI-Basic_Quarter": "季度"
};/**
* 缓冲池
* @type {{Buffer: {}}}

3
public/js/fineui.i18n.js
Unescape View File

@ -183,5 +183,6 @@ BI.i18n = {
"BI-Basic_Minute": "分",
"BI-Basic_Wan": "万",
"BI-Basic_Million": "百万",
"BI-Basic_Billion": "亿"
"BI-Basic_Billion": "亿",
"BI-Basic_Quarter": "季度"
};

40
src/core/listener/listener.show.js
Unescape View File

@ -22,26 +22,28 @@ BI.ShowListener = BI.inherit(BI.OB, {
_init: function () {
BI.ShowListener.superclass._init.apply(this, arguments);
var self = this, o = this.options;
o.eventObj.on(BI.Controller.EVENT_CHANGE, function (type, v, ob) {
if (type === BI.Events.CLICK) {
v = v || o.eventObj.getValue();
v = BI.isArray(v) ? (v.length > 1 ? v.toString() : v[0]) : v;
if (BI.isNull(v)) {
throw new Error("value cannot be null");
if (o.eventObj) {
o.eventObj.on(BI.Controller.EVENT_CHANGE, function (type, v, ob) {
if (type === BI.Events.CLICK) {
v = v || o.eventObj.getValue();
v = BI.isArray(v) ? (v.length > 1 ? v.toString() : v[0]) : v;
if (BI.isNull(v)) {
throw new Error("value cannot be null");
}
var cardName = o.cardNameCreator(v);
if (!o.cardLayout.isCardExisted(cardName)) {
var card = o.cardCreator(cardName);
o.cardLayout.addCardByName(cardName, card);
o.afterCardCreated(cardName);
}
o.cardLayout.showCardByName(cardName);
BI.nextTick(function () {
o.afterCardShow(cardName);
self.fireEvent(BI.ShowListener.EVENT_CHANGE, cardName);
});
}
var cardName = o.cardNameCreator(v);
if (!o.cardLayout.isCardExisted(cardName)) {
var card = o.cardCreator(cardName);
o.cardLayout.addCardByName(cardName, card);
o.afterCardCreated(cardName);
}
o.cardLayout.showCardByName(cardName);
BI.nextTick(function () {
o.afterCardShow(cardName);
self.fireEvent(BI.ShowListener.EVENT_CHANGE, cardName);
});
}
});
});
}
}
});
BI.ShowListener.EVENT_CHANGE = "ShowListener.EVENT_CHANGE";
Write Preview
Loading…
Cancel
Save