fix home screen, fixes #1901

This commit is contained in:
j 2013-10-07 19:41:20 +00:00
parent 2eb48fff09
commit 18fdba8654
4 changed files with 32 additions and 16 deletions

View file

@ -119,8 +119,10 @@ pandora.ui.home = function() {
var folder = pandora.getListData().folder, var folder = pandora.getListData().folder,
value = $findInput.value(); value = $findInput.value();
folder && pandora.$ui.folderList[folder].options({selected: []}); folder && pandora.$ui.folderList[folder].options({selected: []});
if (pandora.user.ui.section == 'items') {
pandora.$ui.findSelect.value('*'); pandora.$ui.findSelect.value('*');
pandora.$ui.findInput.value(value); pandora.$ui.findInput.value(value);
}
that.fadeOutScreen(); that.fadeOutScreen();
pandora.UI.set({ pandora.UI.set({
page: '', page: '',
@ -129,7 +131,8 @@ pandora.ui.home = function() {
? [] ? []
: [{key: '*', value: value, operator: '='}], : [{key: '*', value: value, operator: '='}],
operator: '&' operator: '&'
} },
section: 'items'
}); });
} }
}) })
@ -151,7 +154,8 @@ pandora.ui.home = function() {
.bindEvent({ .bindEvent({
click: function() { click: function() {
pandora.UI.set({ pandora.UI.set({
page: pandora.user.ui.page == 'home' ? '' : pandora.user.ui.page page: pandora.user.ui.page == 'home' ? '' : pandora.user.ui.page,
section: 'items'
}); });
that.fadeOutScreen(); that.fadeOutScreen();
} }

View file

@ -158,8 +158,10 @@ pandora.ui.home = function() {
var folder = pandora.getListData().folder, var folder = pandora.getListData().folder,
value = $findInput.value(); value = $findInput.value();
folder && pandora.$ui.folderList[folder].options({selected: []}); folder && pandora.$ui.folderList[folder].options({selected: []});
if (pandora.user.ui.section == 'items') {
pandora.$ui.findSelect.value('*'); pandora.$ui.findSelect.value('*');
pandora.$ui.findInput.value(value); pandora.$ui.findInput.value(value);
}
that.fadeOutScreen(); that.fadeOutScreen();
pandora.UI.set({ pandora.UI.set({
page: '', page: '',
@ -168,7 +170,8 @@ pandora.ui.home = function() {
? [] ? []
: [{key: '*', value: value, operator: '='}], : [{key: '*', value: value, operator: '='}],
operator: '&' operator: '&'
} },
section: 'items'
}); });
} }
}) })
@ -190,7 +193,8 @@ pandora.ui.home = function() {
.bindEvent({ .bindEvent({
click: function() { click: function() {
pandora.UI.set({ pandora.UI.set({
page: pandora.user.ui.page == 'home' ? '' : pandora.user.ui.page page: pandora.user.ui.page == 'home' ? '' : pandora.user.ui.page,
section: 'items'
}); });
that.fadeOutScreen(); that.fadeOutScreen();
} }

View file

@ -110,8 +110,10 @@ pandora.ui.home = function() {
var folder = pandora.getListData().folder, var folder = pandora.getListData().folder,
value = $findInput.value(); value = $findInput.value();
folder && pandora.$ui.folderList[folder].options({selected: []}); folder && pandora.$ui.folderList[folder].options({selected: []});
if (pandora.user.ui.section == 'items') {
pandora.$ui.findSelect.value('*'); pandora.$ui.findSelect.value('*');
pandora.$ui.findInput.value(value); pandora.$ui.findInput.value(value);
}
that.fadeOutScreen(); that.fadeOutScreen();
pandora.UI.set({ pandora.UI.set({
page: '', page: '',
@ -120,7 +122,8 @@ pandora.ui.home = function() {
? [] ? []
: [{key: '*', value: value, operator: '='}], : [{key: '*', value: value, operator: '='}],
operator: '&' operator: '&'
} },
section: 'items'
}); });
} }
}) })
@ -141,7 +144,8 @@ pandora.ui.home = function() {
.bindEvent({ .bindEvent({
click: function() { click: function() {
pandora.UI.set({ pandora.UI.set({
page: pandora.user.ui.page == 'home' ? '' : pandora.user.ui.page page: pandora.user.ui.page == 'home' ? '' : pandora.user.ui.page,
section: 'items'
}); });
that.fadeOutScreen(); that.fadeOutScreen();
} }

View file

@ -130,8 +130,10 @@ pandora.ui.home = function() {
var folder = pandora.getListData().folder, var folder = pandora.getListData().folder,
value = $findInput.value(); value = $findInput.value();
folder && pandora.$ui.folderList[folder].options({selected: []}); folder && pandora.$ui.folderList[folder].options({selected: []});
if (pandora.user.ui.section == 'items') {
pandora.$ui.findSelect.value('*'); pandora.$ui.findSelect.value('*');
pandora.$ui.findInput.value(value); pandora.$ui.findInput.value(value);
}
that.fadeOutScreen(); that.fadeOutScreen();
pandora.UI.set({ pandora.UI.set({
page: '', page: '',
@ -140,7 +142,8 @@ pandora.ui.home = function() {
? [] ? []
: [{key: '*', value: value, operator: '='}], : [{key: '*', value: value, operator: '='}],
operator: '&' operator: '&'
} },
section: 'items'
}); });
} }
}) })
@ -162,7 +165,8 @@ pandora.ui.home = function() {
.bindEvent({ .bindEvent({
click: function() { click: function() {
pandora.UI.set({ pandora.UI.set({
page: pandora.user.ui.page == 'home' ? '' : pandora.user.ui.page page: pandora.user.ui.page == 'home' ? '' : pandora.user.ui.page,
section: 'items'
}); });
that.fadeOutScreen(); that.fadeOutScreen();
} }