Browse Source

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

master
windy 6 years ago
parent
commit
903aa76769
  1. 2
      dist/base.js
  2. 11
      dist/bundle.js
  3. 56
      dist/bundle.min.js
  4. 11
      dist/fineui.js
  5. 56
      dist/fineui.min.js
  6. 11
      dist/fineui_without_jquery_polyfill.js
  7. 9
      dist/fix/fix.js
  8. 2
      dist/utils.min.js
  9. 2
      src/base/combination/combo.js

2
dist/base.js vendored

@ -3012,7 +3012,7 @@ BI.Combo = BI.inherit(BI.Widget, {
_initPullDownAction: function () { _initPullDownAction: function () {
var self = this, o = this.options; var self = this, o = this.options;
var evs = this.options.trigger.split(","); var evs = (this.options.trigger || "").split(",");
var st = function (e) { var st = function (e) {
if (o.stopEvent) { if (o.stopEvent) {
e.stopEvent(); e.stopEvent();

11
dist/bundle.js vendored

@ -34504,9 +34504,14 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
if (key in $$skipArray) { if (key in $$skipArray) {
return; return;
} }
var configurable = true;
var property = Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(obj, key);
if (property && property.configurable === false) {
configurable = false;
}
var dep = observer && observer['__dep' + key] || new Dep(); var dep = observer && observer['__dep' + key] || new Dep();
observer && (observer['__dep' + key] = dep); observer && (observer['__dep' + key] = dep);
var childOb = !shallow && observe(val, observer, key); var childOb = configurable && !shallow && observe(val, observer, key);
props[key] = { props[key] = {
enumerable: true, enumerable: true,
configurable: true, configurable: true,
@ -34529,7 +34534,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return; return;
} }
val = newVal; val = newVal;
childOb = !shallow && observe(newVal, observer, key); childOb = configurable && !shallow && observe(newVal, observer, key);
if (childOb && value && value.__ob__) { if (childOb && value && value.__ob__) {
childOb._scopeDeps = value.__ob__._scopeDeps; childOb._scopeDeps = value.__ob__._scopeDeps;
childOb._deps = value.__ob__._deps; childOb._deps = value.__ob__._deps;
@ -38378,7 +38383,7 @@ BI.Combo = BI.inherit(BI.Widget, {
_initPullDownAction: function () { _initPullDownAction: function () {
var self = this, o = this.options; var self = this, o = this.options;
var evs = this.options.trigger.split(","); var evs = (this.options.trigger || "").split(",");
var st = function (e) { var st = function (e) {
if (o.stopEvent) { if (o.stopEvent) {
e.stopEvent(); e.stopEvent();

56
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

11
dist/fineui.js vendored

@ -34746,9 +34746,14 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
if (key in $$skipArray) { if (key in $$skipArray) {
return; return;
} }
var configurable = true;
var property = Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(obj, key);
if (property && property.configurable === false) {
configurable = false;
}
var dep = observer && observer['__dep' + key] || new Dep(); var dep = observer && observer['__dep' + key] || new Dep();
observer && (observer['__dep' + key] = dep); observer && (observer['__dep' + key] = dep);
var childOb = !shallow && observe(val, observer, key); var childOb = configurable && !shallow && observe(val, observer, key);
props[key] = { props[key] = {
enumerable: true, enumerable: true,
configurable: true, configurable: true,
@ -34771,7 +34776,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return; return;
} }
val = newVal; val = newVal;
childOb = !shallow && observe(newVal, observer, key); childOb = configurable && !shallow && observe(newVal, observer, key);
if (childOb && value && value.__ob__) { if (childOb && value && value.__ob__) {
childOb._scopeDeps = value.__ob__._scopeDeps; childOb._scopeDeps = value.__ob__._scopeDeps;
childOb._deps = value.__ob__._deps; childOb._deps = value.__ob__._deps;
@ -38620,7 +38625,7 @@ BI.Combo = BI.inherit(BI.Widget, {
_initPullDownAction: function () { _initPullDownAction: function () {
var self = this, o = this.options; var self = this, o = this.options;
var evs = this.options.trigger.split(","); var evs = (this.options.trigger || "").split(",");
var st = function (e) { var st = function (e) {
if (o.stopEvent) { if (o.stopEvent) {
e.stopEvent(); e.stopEvent();

56
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

11
dist/fineui_without_jquery_polyfill.js vendored

@ -23515,9 +23515,14 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
if (key in $$skipArray) { if (key in $$skipArray) {
return; return;
} }
var configurable = true;
var property = Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(obj, key);
if (property && property.configurable === false) {
configurable = false;
}
var dep = observer && observer['__dep' + key] || new Dep(); var dep = observer && observer['__dep' + key] || new Dep();
observer && (observer['__dep' + key] = dep); observer && (observer['__dep' + key] = dep);
var childOb = !shallow && observe(val, observer, key); var childOb = configurable && !shallow && observe(val, observer, key);
props[key] = { props[key] = {
enumerable: true, enumerable: true,
configurable: true, configurable: true,
@ -23540,7 +23545,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return; return;
} }
val = newVal; val = newVal;
childOb = !shallow && observe(newVal, observer, key); childOb = configurable && !shallow && observe(newVal, observer, key);
if (childOb && value && value.__ob__) { if (childOb && value && value.__ob__) {
childOb._scopeDeps = value.__ob__._scopeDeps; childOb._scopeDeps = value.__ob__._scopeDeps;
childOb._deps = value.__ob__._deps; childOb._deps = value.__ob__._deps;
@ -26288,7 +26293,7 @@ BI.Combo = BI.inherit(BI.Widget, {
_initPullDownAction: function () { _initPullDownAction: function () {
var self = this, o = this.options; var self = this, o = this.options;
var evs = this.options.trigger.split(","); var evs = (this.options.trigger || "").split(",");
var st = function (e) { var st = function (e) {
if (o.stopEvent) { if (o.stopEvent) {
e.stopEvent(); e.stopEvent();

9
dist/fix/fix.js vendored

@ -548,9 +548,14 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
if (key in $$skipArray) { if (key in $$skipArray) {
return; return;
} }
var configurable = true;
var property = Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(obj, key);
if (property && property.configurable === false) {
configurable = false;
}
var dep = observer && observer['__dep' + key] || new Dep(); var dep = observer && observer['__dep' + key] || new Dep();
observer && (observer['__dep' + key] = dep); observer && (observer['__dep' + key] = dep);
var childOb = !shallow && observe(val, observer, key); var childOb = configurable && !shallow && observe(val, observer, key);
props[key] = { props[key] = {
enumerable: true, enumerable: true,
configurable: true, configurable: true,
@ -573,7 +578,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return; return;
} }
val = newVal; val = newVal;
childOb = !shallow && observe(newVal, observer, key); childOb = configurable && !shallow && observe(newVal, observer, key);
if (childOb && value && value.__ob__) { if (childOb && value && value.__ob__) {
childOb._scopeDeps = value.__ob__._scopeDeps; childOb._scopeDeps = value.__ob__._scopeDeps;
childOb._deps = value.__ob__._deps; childOb._deps = value.__ob__._deps;

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

2
src/base/combination/combo.js

@ -96,7 +96,7 @@ BI.Combo = BI.inherit(BI.Widget, {
_initPullDownAction: function () { _initPullDownAction: function () {
var self = this, o = this.options; var self = this, o = this.options;
var evs = this.options.trigger.split(","); var evs = (this.options.trigger || "").split(",");
var st = function (e) { var st = function (e) {
if (o.stopEvent) { if (o.stopEvent) {
e.stopEvent(); e.stopEvent();

Loading…
Cancel
Save