Browse Source

Merge pull request #82 in FUI/fineui from ~GUY/fineui:master to master

* commit 'bb69cbe17df5e296e83c13a947a0f6860ae73c64':
  add
  add
es6
guy 7 years ago
parent
commit
b9a177502b
  1. 12
      bi/core.js
  2. 2
      demo/js/widget/combo/demo.static_combo.js
  3. 2
      demo/js/widget/combo/demo.text_value_down_list_combo.js
  4. 2
      demo/js/widget/editor/demo.adapt_editor.js
  5. 12
      dist/bundle.js
  6. 6
      dist/bundle.min.js
  7. 12
      dist/core.js
  8. 6
      dist/demo.js
  9. 4
      src/core/view.js
  10. 8
      src/core/widget.js
  11. 2
      src/css/resource/font.css
  12. 2
      src/less/var.less

12
bi/core.js

@ -4372,14 +4372,14 @@ BI.Widget = BI.inherit(BI.OB, {
render: null, render: null,
beforeMounted: null, beforeMount: null,
mounted: null, mounted: null,
update: function () { update: function () {
}, },
beforeDestroyed: null, beforeDestroy: null,
destroyed: null, destroyed: null,
@ -4507,7 +4507,7 @@ BI.Widget = BI.inherit(BI.OB, {
if (!isMounted) { if (!isMounted) {
return; return;
} }
this.beforeMounted && this.beforeMounted(); this.beforeMount && this.beforeMount();
this._isMounted = true; this._isMounted = true;
this._mountChildren && this._mountChildren(); this._mountChildren && this._mountChildren();
BI.each(this._children, function (i, widget) { BI.each(this._children, function (i, widget) {
@ -4747,7 +4747,7 @@ BI.Widget = BI.inherit(BI.OB, {
}, },
__d: function () { __d: function () {
this.beforeDestroyed && this.beforeDestroyed(); this.beforeDestroy && this.beforeDestroy();
BI.each(this._children, function (i, widget) { BI.each(this._children, function (i, widget) {
widget._unMount && widget._unMount(); widget._unMount && widget._unMount();
}); });
@ -5319,7 +5319,7 @@ BI.View = BI.inherit(BI.V, {
created: null, created: null,
beforeDestroyed: null, beforeDestroy: null,
destroyed: null, destroyed: null,
@ -5810,7 +5810,7 @@ BI.View = BI.inherit(BI.V, {
}, },
_unMount: function () { _unMount: function () {
this.beforeDestroyed && this.beforeDestroyed(); this.beforeDestroy && this.beforeDestroy();
BI.each(this._cardLayouts, function (name, card) { BI.each(this._cardLayouts, function (name, card) {
card && card._unMount(); card && card._unMount();
}); });

2
demo/js/widget/combo/demo.static_combo.js

@ -7,7 +7,7 @@ Demo.StaticCombo = BI.inherit(BI.Widget, {
}, },
beforeMounted: function () { beforeMount: function () {
this.refs.setValue(2); this.refs.setValue(2);
}, },

2
demo/js/widget/combo/demo.text_value_down_list_combo.js

@ -7,7 +7,7 @@ Demo.TextValueDownListCombo = BI.inherit(BI.Widget, {
}, },
beforeMounted:function(){ beforeMount:function(){
this.refs.setValue(2); this.refs.setValue(2);
}, },

2
demo/js/widget/editor/demo.adapt_editor.js

@ -9,7 +9,7 @@ Demo.AdaptEditor = BI.inherit(BI.Widget, {
//这东西好奇怪,不支持设置宽度,那么渲染出来宽度几乎没有,无奈之下只能假装给他个默认值了 //这东西好奇怪,不支持设置宽度,那么渲染出来宽度几乎没有,无奈之下只能假装给他个默认值了
beforeMounted: function () { beforeMount: function () {
this.refs.setValue("Winter is coming !") this.refs.setValue("Winter is coming !")
}, },

12
dist/bundle.js vendored

@ -14363,14 +14363,14 @@ BI.Widget = BI.inherit(BI.OB, {
render: null, render: null,
beforeMounted: null, beforeMount: null,
mounted: null, mounted: null,
update: function () { update: function () {
}, },
beforeDestroyed: null, beforeDestroy: null,
destroyed: null, destroyed: null,
@ -14498,7 +14498,7 @@ BI.Widget = BI.inherit(BI.OB, {
if (!isMounted) { if (!isMounted) {
return; return;
} }
this.beforeMounted && this.beforeMounted(); this.beforeMount && this.beforeMount();
this._isMounted = true; this._isMounted = true;
this._mountChildren && this._mountChildren(); this._mountChildren && this._mountChildren();
BI.each(this._children, function (i, widget) { BI.each(this._children, function (i, widget) {
@ -14738,7 +14738,7 @@ BI.Widget = BI.inherit(BI.OB, {
}, },
__d: function () { __d: function () {
this.beforeDestroyed && this.beforeDestroyed(); this.beforeDestroy && this.beforeDestroy();
BI.each(this._children, function (i, widget) { BI.each(this._children, function (i, widget) {
widget._unMount && widget._unMount(); widget._unMount && widget._unMount();
}); });
@ -15310,7 +15310,7 @@ BI.View = BI.inherit(BI.V, {
created: null, created: null,
beforeDestroyed: null, beforeDestroy: null,
destroyed: null, destroyed: null,
@ -15801,7 +15801,7 @@ BI.View = BI.inherit(BI.V, {
}, },
_unMount: function () { _unMount: function () {
this.beforeDestroyed && this.beforeDestroyed(); this.beforeDestroy && this.beforeDestroy();
BI.each(this._cardLayouts, function (name, card) { BI.each(this._cardLayouts, function (name, card) {
card && card._unMount(); card && card._unMount();
}); });

6
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

12
dist/core.js vendored

@ -14363,14 +14363,14 @@ BI.Widget = BI.inherit(BI.OB, {
render: null, render: null,
beforeMounted: null, beforeMount: null,
mounted: null, mounted: null,
update: function () { update: function () {
}, },
beforeDestroyed: null, beforeDestroy: null,
destroyed: null, destroyed: null,
@ -14498,7 +14498,7 @@ BI.Widget = BI.inherit(BI.OB, {
if (!isMounted) { if (!isMounted) {
return; return;
} }
this.beforeMounted && this.beforeMounted(); this.beforeMount && this.beforeMount();
this._isMounted = true; this._isMounted = true;
this._mountChildren && this._mountChildren(); this._mountChildren && this._mountChildren();
BI.each(this._children, function (i, widget) { BI.each(this._children, function (i, widget) {
@ -14738,7 +14738,7 @@ BI.Widget = BI.inherit(BI.OB, {
}, },
__d: function () { __d: function () {
this.beforeDestroyed && this.beforeDestroyed(); this.beforeDestroy && this.beforeDestroy();
BI.each(this._children, function (i, widget) { BI.each(this._children, function (i, widget) {
widget._unMount && widget._unMount(); widget._unMount && widget._unMount();
}); });
@ -15310,7 +15310,7 @@ BI.View = BI.inherit(BI.V, {
created: null, created: null,
beforeDestroyed: null, beforeDestroy: null,
destroyed: null, destroyed: null,
@ -15801,7 +15801,7 @@ BI.View = BI.inherit(BI.V, {
}, },
_unMount: function () { _unMount: function () {
this.beforeDestroyed && this.beforeDestroyed(); this.beforeDestroy && this.beforeDestroy();
BI.each(this._cardLayouts, function (name, card) { BI.each(this._cardLayouts, function (name, card) {
card && card._unMount(); card && card._unMount();
}); });

6
dist/demo.js vendored

@ -6993,7 +6993,7 @@ Demo.StaticCombo = BI.inherit(BI.Widget, {
}, },
beforeMounted: function () { beforeMount: function () {
this.refs.setValue(2); this.refs.setValue(2);
}, },
@ -7096,7 +7096,7 @@ Demo.TextValueDownListCombo = BI.inherit(BI.Widget, {
}, },
beforeMounted:function(){ beforeMount:function(){
this.refs.setValue(2); this.refs.setValue(2);
}, },
@ -7479,7 +7479,7 @@ Demo.AdaptEditor = BI.inherit(BI.Widget, {
//这东西好奇怪,不支持设置宽度,那么渲染出来宽度几乎没有,无奈之下只能假装给他个默认值了 //这东西好奇怪,不支持设置宽度,那么渲染出来宽度几乎没有,无奈之下只能假装给他个默认值了
beforeMounted: function () { beforeMount: function () {
this.refs.setValue("Winter is coming !") this.refs.setValue("Winter is coming !")
}, },

4
src/core/view.js

@ -10,7 +10,7 @@ BI.View = BI.inherit(BI.V, {
created: null, created: null,
beforeDestroyed: null, beforeDestroy: null,
destroyed: null, destroyed: null,
@ -501,7 +501,7 @@ BI.View = BI.inherit(BI.V, {
}, },
_unMount: function () { _unMount: function () {
this.beforeDestroyed && this.beforeDestroyed(); this.beforeDestroy && this.beforeDestroy();
BI.each(this._cardLayouts, function (name, card) { BI.each(this._cardLayouts, function (name, card) {
card && card._unMount(); card && card._unMount();
}); });

8
src/core/widget.js

@ -30,14 +30,14 @@ BI.Widget = BI.inherit(BI.OB, {
render: null, render: null,
beforeMounted: null, beforeMount: null,
mounted: null, mounted: null,
update: function () { update: function () {
}, },
beforeDestroyed: null, beforeDestroy: null,
destroyed: null, destroyed: null,
@ -165,7 +165,7 @@ BI.Widget = BI.inherit(BI.OB, {
if (!isMounted) { if (!isMounted) {
return; return;
} }
this.beforeMounted && this.beforeMounted(); this.beforeMount && this.beforeMount();
this._isMounted = true; this._isMounted = true;
this._mountChildren && this._mountChildren(); this._mountChildren && this._mountChildren();
BI.each(this._children, function (i, widget) { BI.each(this._children, function (i, widget) {
@ -405,7 +405,7 @@ BI.Widget = BI.inherit(BI.OB, {
}, },
__d: function () { __d: function () {
this.beforeDestroyed && this.beforeDestroyed(); this.beforeDestroy && this.beforeDestroy();
BI.each(this._children, function (i, widget) { BI.each(this._children, function (i, widget) {
widget._unMount && widget._unMount(); widget._unMount && widget._unMount();
}); });

2
src/css/resource/font.css

@ -1,6 +1,6 @@
@font-face { @font-face {
font-family: 'bi'; font-family: 'bi';
src: url('/font/iconfont.eot'), /* IE6-IE8 */ url('/font/iconfont.woff') format('woff'), /* chrome、firefox */ url('/font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('/font/iconfont.svg#svgFontName') format('svg'); src: url('font/iconfont.eot'), /* IE6-IE8 */ url('font/iconfont.woff') format('woff'), /* chrome、firefox */ url('font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('font/iconfont.svg#svgFontName') format('svg');
/* iOS 4.1- */ /* iOS 4.1- */
} }

2
src/less/var.less

@ -1,4 +1,4 @@
@webUrl: '/'; @webUrl: '';
@imageUrl: 'images/1x/'; //图片的基本地址 @imageUrl: 'images/1x/'; //图片的基本地址
@image2xUrl: 'images/2x/'; //图片的基本地址 @image2xUrl: 'images/2x/'; //图片的基本地址

Loading…
Cancel
Save