Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #1049 in VISUAL/fineui from ~DAILER/fineui:master to master 

* commit '9d7b0f08c3ca939361c89ef223d2cfea5507ab4d':
  DEC-8536 fix: ie.compact 也更新一下
  build
  DEC-8536  fix : 修复 _mount执行中断导致context指向错误问题.
es6
guy 5 years ago
parent
dfca911e4b 9d7b0f08c3
commit
a115c6e4e1
16 changed files with 115 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      dist/2.0/fineui.ie.js
  2. 6
      dist/2.0/fineui.ie.min.js
  3. 25
      dist/2.0/fineui.js
  4. 6
      dist/2.0/fineui.min.js
  5. 9
      dist/bundle.ie.js
  6. 6
      dist/bundle.ie.min.js
  7. 25
      dist/bundle.js
  8. 6
      dist/bundle.min.js
  9. 8
      dist/fineui.ie.js
  10. 4
      dist/fineui.ie.min.js
  11. 24
      dist/fineui.js
  12. 4
      dist/fineui.min.js
  13. 24
      dist/fineui_without_jquery_polyfill.js
  14. 8
      dist/fix/fix.compact.ie.js
  15. 24
      dist/fix/fix.compact.js
  16. 2
      dist/utils.min.js

9
dist/2.0/fineui.ie.js vendored
Unescape View File

@ -88614,7 +88614,11 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
var old = BI.Widget.prototype[name]; var old = BI.Widget.prototype[name];
old && (BI.Widget.prototype[name] = function () { old && (BI.Widget.prototype[name] = function () {
this.store && pushTarget(this.store); this.store && pushTarget(this.store);
var res = old.apply(this, arguments); try {
var res = old.apply(this, arguments);
} catch (e) {
console.error(e);
}
this.store && popTarget(); this.store && popTarget();
return res; return res;
}); });
@ -88741,7 +88745,8 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
} }
} }
BI.watch = Fix.watch; BI.watch = Fix.watch;
}());(function () { }());
(function () {
var Events = { var Events = {
// Bind an event to a `callback` function. Passing `"all"` will bind // Bind an event to a `callback` function. Passing `"all"` will bind

6
dist/2.0/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

25
dist/2.0/fineui.js vendored
Unescape View File

@ -88828,7 +88828,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, {
}); });
BI.ValueChooserPane.EVENT_CHANGE = "EVENT_CHANGE"; BI.ValueChooserPane.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () { BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
function initWatch(vm, watch) { function initWatch (vm, watch) {
vm._watchers || (vm._watchers = []); vm._watchers || (vm._watchers = []);
for (var key in watch) { for (var key in watch) {
var handler = watch[key]; var handler = watch[key];
@ -88842,7 +88842,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
} }
} }
function createWatcher(vm, keyOrFn, handler) { function createWatcher (vm, keyOrFn, handler) {
return Fix.watch(vm.model, keyOrFn, _.bind(handler, vm), { return Fix.watch(vm.model, keyOrFn, _.bind(handler, vm), {
store: vm.store store: vm.store
}); });
@ -88851,24 +88851,24 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
var target = null; var target = null;
var targetStack = []; var targetStack = [];
function pushTarget(_target) { function pushTarget (_target) {
if (target) targetStack.push(target); if (target) targetStack.push(target);
Fix.Model.target = target = _target; Fix.Model.target = target = _target;
} }
function popTarget() { function popTarget () {
Fix.Model.target = target = targetStack.pop(); Fix.Model.target = target = targetStack.pop();
} }
var context = null; var context = null;
var contextStack = []; var contextStack = [];
function pushContext(_context) { function pushContext (_context) {
if (context) contextStack.push(context); if (context) contextStack.push(context);
Fix.Model.context = context = _context; Fix.Model.context = context = _context;
} }
function popContext() { function popContext () {
Fix.Model.context = context = contextStack.pop(); Fix.Model.context = context = contextStack.pop();
} }
@ -88889,7 +88889,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
}, options); }, options);
}; };
function findStore(widget) { function findStore (widget) {
if (target != null) { if (target != null) {
return target; return target;
} }
@ -88935,7 +88935,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
}; };
}); });
function createStore() { function createStore () {
var needPop = false; var needPop = false;
if (_global.Fix && this._store) { if (_global.Fix && this._store) {
var store = findStore(this.options.context || this.options.element); var store = findStore(this.options.context || this.options.element);
@ -89001,7 +89001,11 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
var old = BI.Widget.prototype[name]; var old = BI.Widget.prototype[name];
old && (BI.Widget.prototype[name] = function () { old && (BI.Widget.prototype[name] = function () {
this.store && pushTarget(this.store); this.store && pushTarget(this.store);
var res = old.apply(this, arguments); try {
var res = old.apply(this, arguments);
} catch (e) {
console.error(e);
}
this.store && popTarget(); this.store && popTarget();
return res; return res;
}); });
@ -89075,7 +89079,8 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
}; };
} }
BI.watch = Fix.watch; BI.watch = Fix.watch;
}());(function () { }());
(function () {
var Events = { var Events = {
// Bind an event to a `callback` function. Passing `"all"` will bind // Bind an event to a `callback` function. Passing `"all"` will bind

6
dist/2.0/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

9
dist/bundle.ie.js vendored
Unescape View File

@ -88614,7 +88614,11 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
var old = BI.Widget.prototype[name]; var old = BI.Widget.prototype[name];
old && (BI.Widget.prototype[name] = function () { old && (BI.Widget.prototype[name] = function () {
this.store && pushTarget(this.store); this.store && pushTarget(this.store);
var res = old.apply(this, arguments); try {
var res = old.apply(this, arguments);
} catch (e) {
console.error(e);
}
this.store && popTarget(); this.store && popTarget();
return res; return res;
}); });
@ -88741,7 +88745,8 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
} }
} }
BI.watch = Fix.watch; BI.watch = Fix.watch;
}());(function () { }());
(function () {
var Events = { var Events = {
// Bind an event to a `callback` function. Passing `"all"` will bind // Bind an event to a `callback` function. Passing `"all"` will bind

6
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

25
dist/bundle.js vendored
Unescape View File

@ -88828,7 +88828,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, {
}); });
BI.ValueChooserPane.EVENT_CHANGE = "EVENT_CHANGE"; BI.ValueChooserPane.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () { BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
function initWatch(vm, watch) { function initWatch (vm, watch) {
vm._watchers || (vm._watchers = []); vm._watchers || (vm._watchers = []);
for (var key in watch) { for (var key in watch) {
var handler = watch[key]; var handler = watch[key];
@ -88842,7 +88842,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
} }
} }
function createWatcher(vm, keyOrFn, handler) { function createWatcher (vm, keyOrFn, handler) {
return Fix.watch(vm.model, keyOrFn, _.bind(handler, vm), { return Fix.watch(vm.model, keyOrFn, _.bind(handler, vm), {
store: vm.store store: vm.store
}); });
@ -88851,24 +88851,24 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
var target = null; var target = null;
var targetStack = []; var targetStack = [];
function pushTarget(_target) { function pushTarget (_target) {
if (target) targetStack.push(target); if (target) targetStack.push(target);
Fix.Model.target = target = _target; Fix.Model.target = target = _target;
} }
function popTarget() { function popTarget () {
Fix.Model.target = target = targetStack.pop(); Fix.Model.target = target = targetStack.pop();
} }
var context = null; var context = null;
var contextStack = []; var contextStack = [];
function pushContext(_context) { function pushContext (_context) {
if (context) contextStack.push(context); if (context) contextStack.push(context);
Fix.Model.context = context = _context; Fix.Model.context = context = _context;
} }
function popContext() { function popContext () {
Fix.Model.context = context = contextStack.pop(); Fix.Model.context = context = contextStack.pop();
} }
@ -88889,7 +88889,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
}, options); }, options);
}; };
function findStore(widget) { function findStore (widget) {
if (target != null) { if (target != null) {
return target; return target;
} }
@ -88935,7 +88935,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
}; };
}); });
function createStore() { function createStore () {
var needPop = false; var needPop = false;
if (_global.Fix && this._store) { if (_global.Fix && this._store) {
var store = findStore(this.options.context || this.options.element); var store = findStore(this.options.context || this.options.element);
@ -89001,7 +89001,11 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
var old = BI.Widget.prototype[name]; var old = BI.Widget.prototype[name];
old && (BI.Widget.prototype[name] = function () { old && (BI.Widget.prototype[name] = function () {
this.store && pushTarget(this.store); this.store && pushTarget(this.store);
var res = old.apply(this, arguments); try {
var res = old.apply(this, arguments);
} catch (e) {
console.error(e);
}
this.store && popTarget(); this.store && popTarget();
return res; return res;
}); });
@ -89075,7 +89079,8 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
}; };
} }
BI.watch = Fix.watch; BI.watch = Fix.watch;
}());(function () { }());
(function () {
var Events = { var Events = {
// Bind an event to a `callback` function. Passing `"all"` will bind // Bind an event to a `callback` function. Passing `"all"` will bind

6
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
dist/fineui.ie.js vendored
Unescape View File

@ -89443,7 +89443,11 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);(function () {
var old = BI.Widget.prototype[name]; var old = BI.Widget.prototype[name];
old && (BI.Widget.prototype[name] = function () { old && (BI.Widget.prototype[name] = function () {
this.store && pushTarget(this.store); this.store && pushTarget(this.store);
var res = old.apply(this, arguments); try {
var res = old.apply(this, arguments);
} catch (e) {
console.error(e);
}
this.store && popTarget(); this.store && popTarget();
return res; return res;
}); });
@ -89570,4 +89574,4 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);(function () {
} }
} }
BI.watch = Fix.watch; BI.watch = Fix.watch;
}()); }());

4
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

24
dist/fineui.js vendored
Unescape View File

@ -89657,7 +89657,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);(function () {
// Create the default BI.history. // Create the default BI.history.
BI.history = new History; BI.history = new History;
}());;(function () { }());;(function () {
function initWatch(vm, watch) { function initWatch (vm, watch) {
vm._watchers || (vm._watchers = []); vm._watchers || (vm._watchers = []);
for (var key in watch) { for (var key in watch) {
var handler = watch[key]; var handler = watch[key];
@ -89671,7 +89671,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);(function () {
} }
} }
function createWatcher(vm, keyOrFn, handler) { function createWatcher (vm, keyOrFn, handler) {
return Fix.watch(vm.model, keyOrFn, _.bind(handler, vm), { return Fix.watch(vm.model, keyOrFn, _.bind(handler, vm), {
store: vm.store store: vm.store
}); });
@ -89680,24 +89680,24 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);(function () {
var target = null; var target = null;
var targetStack = []; var targetStack = [];
function pushTarget(_target) { function pushTarget (_target) {
if (target) targetStack.push(target); if (target) targetStack.push(target);
Fix.Model.target = target = _target; Fix.Model.target = target = _target;
} }
function popTarget() { function popTarget () {
Fix.Model.target = target = targetStack.pop(); Fix.Model.target = target = targetStack.pop();
} }
var context = null; var context = null;
var contextStack = []; var contextStack = [];
function pushContext(_context) { function pushContext (_context) {
if (context) contextStack.push(context); if (context) contextStack.push(context);
Fix.Model.context = context = _context; Fix.Model.context = context = _context;
} }
function popContext() { function popContext () {
Fix.Model.context = context = contextStack.pop(); Fix.Model.context = context = contextStack.pop();
} }
@ -89718,7 +89718,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);(function () {
}, options); }, options);
}; };
function findStore(widget) { function findStore (widget) {
if (target != null) { if (target != null) {
return target; return target;
} }
@ -89764,7 +89764,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);(function () {
}; };
}); });
function createStore() { function createStore () {
var needPop = false; var needPop = false;
if (_global.Fix && this._store) { if (_global.Fix && this._store) {
var store = findStore(this.options.context || this.options.element); var store = findStore(this.options.context || this.options.element);
@ -89830,7 +89830,11 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);(function () {
var old = BI.Widget.prototype[name]; var old = BI.Widget.prototype[name];
old && (BI.Widget.prototype[name] = function () { old && (BI.Widget.prototype[name] = function () {
this.store && pushTarget(this.store); this.store && pushTarget(this.store);
var res = old.apply(this, arguments); try {
var res = old.apply(this, arguments);
} catch (e) {
console.error(e);
}
this.store && popTarget(); this.store && popTarget();
return res; return res;
}); });
@ -89904,4 +89908,4 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);(function () {
}; };
} }
BI.watch = Fix.watch; BI.watch = Fix.watch;
}()); }());

4
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

24
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -71679,7 +71679,7 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, {
}); });
BI.ValueChooserPane.EVENT_CHANGE = "EVENT_CHANGE"; BI.ValueChooserPane.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () { BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
function initWatch(vm, watch) { function initWatch (vm, watch) {
vm._watchers || (vm._watchers = []); vm._watchers || (vm._watchers = []);
for (var key in watch) { for (var key in watch) {
var handler = watch[key]; var handler = watch[key];
@ -71693,7 +71693,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
} }
} }
function createWatcher(vm, keyOrFn, handler) { function createWatcher (vm, keyOrFn, handler) {
return Fix.watch(vm.model, keyOrFn, _.bind(handler, vm), { return Fix.watch(vm.model, keyOrFn, _.bind(handler, vm), {
store: vm.store store: vm.store
}); });
@ -71702,24 +71702,24 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
var target = null; var target = null;
var targetStack = []; var targetStack = [];
function pushTarget(_target) { function pushTarget (_target) {
if (target) targetStack.push(target); if (target) targetStack.push(target);
Fix.Model.target = target = _target; Fix.Model.target = target = _target;
} }
function popTarget() { function popTarget () {
Fix.Model.target = target = targetStack.pop(); Fix.Model.target = target = targetStack.pop();
} }
var context = null; var context = null;
var contextStack = []; var contextStack = [];
function pushContext(_context) { function pushContext (_context) {
if (context) contextStack.push(context); if (context) contextStack.push(context);
Fix.Model.context = context = _context; Fix.Model.context = context = _context;
} }
function popContext() { function popContext () {
Fix.Model.context = context = contextStack.pop(); Fix.Model.context = context = contextStack.pop();
} }
@ -71740,7 +71740,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
}, options); }, options);
}; };
function findStore(widget) { function findStore (widget) {
if (target != null) { if (target != null) {
return target; return target;
} }
@ -71786,7 +71786,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
}; };
}); });
function createStore() { function createStore () {
var needPop = false; var needPop = false;
if (_global.Fix && this._store) { if (_global.Fix && this._store) {
var store = findStore(this.options.context || this.options.element); var store = findStore(this.options.context || this.options.element);
@ -71852,7 +71852,11 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
var old = BI.Widget.prototype[name]; var old = BI.Widget.prototype[name];
old && (BI.Widget.prototype[name] = function () { old && (BI.Widget.prototype[name] = function () {
this.store && pushTarget(this.store); this.store && pushTarget(this.store);
var res = old.apply(this, arguments); try {
var res = old.apply(this, arguments);
} catch (e) {
console.error(e);
}
this.store && popTarget(); this.store && popTarget();
return res; return res;
}); });
@ -71926,4 +71930,4 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
}; };
} }
BI.watch = Fix.watch; BI.watch = Fix.watch;
}()); }());

8
dist/fix/fix.compact.ie.js vendored
Unescape View File

@ -189,7 +189,11 @@
var old = BI.Widget.prototype[name]; var old = BI.Widget.prototype[name];
old && (BI.Widget.prototype[name] = function () { old && (BI.Widget.prototype[name] = function () {
this.store && pushTarget(this.store); this.store && pushTarget(this.store);
var res = old.apply(this, arguments); try {
var res = old.apply(this, arguments);
} catch (e) {
console.error(e);
}
this.store && popTarget(); this.store && popTarget();
return res; return res;
}); });
@ -316,4 +320,4 @@
} }
} }
BI.watch = Fix.watch; BI.watch = Fix.watch;
}()); }());

24
dist/fix/fix.compact.js vendored
Unescape View File

@ -1,5 +1,5 @@
;(function () { ;(function () {
function initWatch(vm, watch) { function initWatch (vm, watch) {
vm._watchers || (vm._watchers = []); vm._watchers || (vm._watchers = []);
for (var key in watch) { for (var key in watch) {
var handler = watch[key]; var handler = watch[key];
@ -13,7 +13,7 @@
} }
} }
function createWatcher(vm, keyOrFn, handler) { function createWatcher (vm, keyOrFn, handler) {
return Fix.watch(vm.model, keyOrFn, _.bind(handler, vm), { return Fix.watch(vm.model, keyOrFn, _.bind(handler, vm), {
store: vm.store store: vm.store
}); });
@ -22,24 +22,24 @@
var target = null; var target = null;
var targetStack = []; var targetStack = [];
function pushTarget(_target) { function pushTarget (_target) {
if (target) targetStack.push(target); if (target) targetStack.push(target);
Fix.Model.target = target = _target; Fix.Model.target = target = _target;
} }
function popTarget() { function popTarget () {
Fix.Model.target = target = targetStack.pop(); Fix.Model.target = target = targetStack.pop();
} }
var context = null; var context = null;
var contextStack = []; var contextStack = [];
function pushContext(_context) { function pushContext (_context) {
if (context) contextStack.push(context); if (context) contextStack.push(context);
Fix.Model.context = context = _context; Fix.Model.context = context = _context;
} }
function popContext() { function popContext () {
Fix.Model.context = context = contextStack.pop(); Fix.Model.context = context = contextStack.pop();
} }
@ -60,7 +60,7 @@
}, options); }, options);
}; };
function findStore(widget) { function findStore (widget) {
if (target != null) { if (target != null) {
return target; return target;
} }
@ -106,7 +106,7 @@
}; };
}); });
function createStore() { function createStore () {
var needPop = false; var needPop = false;
if (_global.Fix && this._store) { if (_global.Fix && this._store) {
var store = findStore(this.options.context || this.options.element); var store = findStore(this.options.context || this.options.element);
@ -172,7 +172,11 @@
var old = BI.Widget.prototype[name]; var old = BI.Widget.prototype[name];
old && (BI.Widget.prototype[name] = function () { old && (BI.Widget.prototype[name] = function () {
this.store && pushTarget(this.store); this.store && pushTarget(this.store);
var res = old.apply(this, arguments); try {
var res = old.apply(this, arguments);
} catch (e) {
console.error(e);
}
this.store && popTarget(); this.store && popTarget();
return res; return res;
}); });
@ -246,4 +250,4 @@
}; };
} }
BI.watch = Fix.watch; BI.watch = Fix.watch;
}()); }());

2
dist/utils.min.js vendored
View File

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