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
windy 6 years ago
parent
commit
840ce62291
  1. 4
      dist/bundle.js
  2. 4
      dist/fineui.js
  3. 4
      dist/fineui_without_jquery_polyfill.js
  4. 4
      dist/fix/fix.js

4
dist/bundle.js vendored

@ -34412,11 +34412,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var ob = void 0; var ob = void 0;
if (value.__ob__ instanceof Observer) { if (value.__ob__ instanceof Observer) {
ob = value.__ob__; ob = value.__ob__;
} else if (observerState.shouldConvert && (_.isArray(value) || isPlainObject(value))) { } else if (observerState.shouldConvert && Object.isExtensible(value) && (_.isArray(value) || isPlainObject(value))) {
ob = new Observer(value); ob = new Observer(value);
} }
if (ob) {
ob.parent = parentObserver || ob.parent; ob.parent = parentObserver || ob.parent;
ob.parentKey = parentKey; ob.parentKey = parentKey;
}
return ob; return ob;
} }

4
dist/fineui.js vendored

@ -34654,11 +34654,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var ob = void 0; var ob = void 0;
if (value.__ob__ instanceof Observer) { if (value.__ob__ instanceof Observer) {
ob = value.__ob__; ob = value.__ob__;
} else if (observerState.shouldConvert && (_.isArray(value) || isPlainObject(value))) { } else if (observerState.shouldConvert && Object.isExtensible(value) && (_.isArray(value) || isPlainObject(value))) {
ob = new Observer(value); ob = new Observer(value);
} }
if (ob) {
ob.parent = parentObserver || ob.parent; ob.parent = parentObserver || ob.parent;
ob.parentKey = parentKey; ob.parentKey = parentKey;
}
return ob; return ob;
} }

4
dist/fineui_without_jquery_polyfill.js vendored

@ -23423,11 +23423,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var ob = void 0; var ob = void 0;
if (value.__ob__ instanceof Observer) { if (value.__ob__ instanceof Observer) {
ob = value.__ob__; ob = value.__ob__;
} else if (observerState.shouldConvert && (_.isArray(value) || isPlainObject(value))) { } else if (observerState.shouldConvert && Object.isExtensible(value) && (_.isArray(value) || isPlainObject(value))) {
ob = new Observer(value); ob = new Observer(value);
} }
if (ob) {
ob.parent = parentObserver || ob.parent; ob.parent = parentObserver || ob.parent;
ob.parentKey = parentKey; ob.parentKey = parentKey;
}
return ob; return ob;
} }

4
dist/fix/fix.js vendored

@ -456,11 +456,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var ob = void 0; var ob = void 0;
if (value.__ob__ instanceof Observer) { if (value.__ob__ instanceof Observer) {
ob = value.__ob__; ob = value.__ob__;
} else if (observerState.shouldConvert && (_.isArray(value) || isPlainObject(value))) { } else if (observerState.shouldConvert && Object.isExtensible(value) && (_.isArray(value) || isPlainObject(value))) {
ob = new Observer(value); ob = new Observer(value);
} }
if (ob) {
ob.parent = parentObserver || ob.parent; ob.parent = parentObserver || ob.parent;
ob.parentKey = parentKey; ob.parentKey = parentKey;
}
return ob; return ob;
} }

Loading…
Cancel
Save