Browse Source

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

es6
windy 7 years ago
parent
commit
ac5e232b66
  1. 2
      dist/_fineui.min.js
  2. 7
      dist/bundle.js
  3. 2
      dist/bundle.min.js
  4. 2
      dist/fineui.min.js
  5. 7
      dist/fix/fix.compact.js

2
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/bundle.js vendored

@ -110995,12 +110995,15 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
widget = widget || context; widget = widget || context;
var p = widget; var p = widget;
while (p) { while (p) {
if (p.store || p.__cacheStore) { if (p instanceof Fix.Model || p.store || p.__cacheStore) {
break; break;
} }
p = p._parent || (p.options && p.options.element); p = p._parent || (p.options && p.options.element);
} }
if (p) { if (p) {
if (p instanceof Fix.Model) {
return widget.__cacheStore = p;
}
widget.__cacheStore = p.store || p.__cacheStore; widget.__cacheStore = p.store || p.__cacheStore;
return p.__cacheStore || p.store; return p.__cacheStore || p.store;
} }
@ -111034,7 +111037,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
var self = this; var self = this;
var needPop = false; var needPop = false;
if (window.Fix && this._store) { if (window.Fix && this._store) {
var store = findStore(this.options.element); var store = findStore(this.options.context || this.options.element);
if (store) { if (store) {
pushTarget(store); pushTarget(store);
needPop = true; needPop = true;

2
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/fix/fix.compact.js vendored

@ -67,12 +67,15 @@
widget = widget || context; widget = widget || context;
var p = widget; var p = widget;
while (p) { while (p) {
if (p.store || p.__cacheStore) { if (p instanceof Fix.Model || p.store || p.__cacheStore) {
break; break;
} }
p = p._parent || (p.options && p.options.element); p = p._parent || (p.options && p.options.element);
} }
if (p) { if (p) {
if (p instanceof Fix.Model) {
return widget.__cacheStore = p;
}
widget.__cacheStore = p.store || p.__cacheStore; widget.__cacheStore = p.store || p.__cacheStore;
return p.__cacheStore || p.store; return p.__cacheStore || p.store;
} }
@ -106,7 +109,7 @@
var self = this; var self = this;
var needPop = false; var needPop = false;
if (window.Fix && this._store) { if (window.Fix && this._store) {
var store = findStore(this.options.element); var store = findStore(this.options.context || this.options.element);
if (store) { if (store) {
pushTarget(store); pushTarget(store);
needPop = true; needPop = true;

Loading…
Cancel
Save