Browse Source

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

# Conflicts:
#	dist/bundle.min.js
#	dist/fineui.min.js
#	dist/utils.min.js
es6
guy 6 years ago
parent
commit
f7a0a6ff25
  1. 4
      dist/bundle.js
  2. 16
      dist/bundle.min.js
  3. 4
      dist/fineui.js
  4. 16
      dist/fineui.min.js
  5. 4
      dist/fineui_without_jquery_polyfill.js
  6. 4
      dist/fix/fix.js
  7. 8
      dist/utils.min.js

4
dist/bundle.js vendored

@ -35210,10 +35210,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
this.$$model && (this.model.__ob__ = this.$$model.__ob__); this.$$model && (this.model.__ob__ = this.$$model.__ob__);
this._init(); this._init();
initState(this, state); initState(this, state);
initMixins(this, mixins);
initMethods(this, actions);
initComputed(this, computed); initComputed(this, computed);
initWatch(this, watch$$1); initWatch(this, watch$$1);
initMethods(this, actions);
initMixins(this, mixins);
this.created && this.created(); this.created && this.created();
if (this.$$model) { if (this.$$model) {
return this.model; return this.model;

16
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.js vendored

@ -35452,10 +35452,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
this.$$model && (this.model.__ob__ = this.$$model.__ob__); this.$$model && (this.model.__ob__ = this.$$model.__ob__);
this._init(); this._init();
initState(this, state); initState(this, state);
initMixins(this, mixins);
initMethods(this, actions);
initComputed(this, computed); initComputed(this, computed);
initWatch(this, watch$$1); initWatch(this, watch$$1);
initMethods(this, actions);
initMixins(this, mixins);
this.created && this.created(); this.created && this.created();
if (this.$$model) { if (this.$$model) {
return this.model; return this.model;

16
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/fineui_without_jquery_polyfill.js vendored

@ -24243,10 +24243,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
this.$$model && (this.model.__ob__ = this.$$model.__ob__); this.$$model && (this.model.__ob__ = this.$$model.__ob__);
this._init(); this._init();
initState(this, state); initState(this, state);
initMixins(this, mixins);
initMethods(this, actions);
initComputed(this, computed); initComputed(this, computed);
initWatch(this, watch$$1); initWatch(this, watch$$1);
initMethods(this, actions);
initMixins(this, mixins);
this.created && this.created(); this.created && this.created();
if (this.$$model) { if (this.$$model) {
return this.model; return this.model;

4
dist/fix/fix.js vendored

@ -1332,10 +1332,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
this.$$model && (this.model.__ob__ = this.$$model.__ob__); this.$$model && (this.model.__ob__ = this.$$model.__ob__);
this._init(); this._init();
initState(this, state); initState(this, state);
initMixins(this, mixins);
initMethods(this, actions);
initComputed(this, computed); initComputed(this, computed);
initWatch(this, watch$$1); initWatch(this, watch$$1);
initMethods(this, actions);
initMixins(this, mixins);
this.created && this.created(); this.created && this.created();
if (this.$$model) { if (this.$$model) {
return this.model; return this.model;

8
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save