forked from 0x2620/pandora
in UI, only set item to '' on find change if we're not dealing with a context change via item edit
This commit is contained in:
parent
4431e4f5a3
commit
c0e85fdbe8
1 changed files with 4 additions and 3 deletions
|
@ -64,9 +64,9 @@ pandora.UI = (function() {
|
||||||
pandora.user.ui._list = list;
|
pandora.user.ui._list = list;
|
||||||
pandora.user.ui._filterState = pandora.getFilterState(args.find);
|
pandora.user.ui._filterState = pandora.getFilterState(args.find);
|
||||||
pandora.user.ui._findState = pandora.getFindState(args.find);
|
pandora.user.ui._findState = pandora.getFindState(args.find);
|
||||||
if (pandora.$ui.appPanel) {
|
if (pandora.$ui.appPanel && !pandora.stayInItemView) {
|
||||||
// if we're not on page load,
|
// if we're not on page load, and if find isn't a context change
|
||||||
// switch from item view to list view
|
// caused by an edit, then switch from item view to list view
|
||||||
args['item'] = '';
|
args['item'] = '';
|
||||||
}
|
}
|
||||||
if (list != self.previousUI._list) {
|
if (list != self.previousUI._list) {
|
||||||
|
@ -179,6 +179,7 @@ pandora.UI = (function() {
|
||||||
});
|
});
|
||||||
Ox.len(set) && pandora.api.setUI(set);
|
Ox.len(set) && pandora.api.setUI(set);
|
||||||
triggerEvents && Ox.forEach(trigger, function(val, key) {
|
triggerEvents && Ox.forEach(trigger, function(val, key) {
|
||||||
|
Ox.Log('UI', 'TRIGGER ' + key + ' ' + val);
|
||||||
Ox.forEach(pandora.$ui, function(element) {
|
Ox.forEach(pandora.$ui, function(element) {
|
||||||
Ox.UI.isElement(element) && element.triggerEvent('pandora_' + key.toLowerCase(), {
|
Ox.UI.isElement(element) && element.triggerEvent('pandora_' + key.toLowerCase(), {
|
||||||
value: val,
|
value: val,
|
||||||
|
|
Loading…
Reference in a new issue