decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

on page load w/o find, forget previous find (making just removing find and reloading work as expected) ... fixes #207

Browse source
This commit is contained in:
rolux 2012-02-19 15:18:21 +00:00
parent 7398993bc1
commit 5204fc6521
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
static/js/pandora/URL.js
View file

@ -126,6 +126,12 @@ pandora.URL = (function() {
if (!state.item) { if (!state.item) {
set.find = state.find; set.find = state.find;
} }
} else {
if (!pandora.$ui.appPanel) {
// on page load without find, clear find, so that
// removing query and reloading works as expected
set.find = pandora.site.user.ui.find;
}
} }
Ox.Request.cancel(); Ox.Request.cancel();

11
static/js/pandora/home.padma.js
View file

@ -379,7 +379,8 @@ pandora.ui.home = function() {
scrollToPosition(position - 1, true); scrollToPosition(position - 1, true);
}, },
mouserepeat: function() { mouserepeat: function() {
if (counter++ % 10 == 0) { // fixme: arbitrary
if (counter++ % 5 == 0) {
scrollToPosition(position - 1, false); scrollToPosition(position - 1, false);
} }
} }
@ -403,9 +404,8 @@ pandora.ui.home = function() {
scrollToPosition(position + 1, true); scrollToPosition(position + 1, true);
}, },
mouserepeat: function() { mouserepeat: function() {
Ox.print('---------------------------') // fixme: arbitrary
if (counter++ % 10 == 0) { if (counter++ % 5 == 0) {
Ox.print('YES')
scrollToPosition(position + 1, false); scrollToPosition(position + 1, false);
} }
} }
@ -427,7 +427,8 @@ pandora.ui.home = function() {
}); });
}, },
mousewheel: function(e, delta, deltaX, deltaY) { mousewheel: function(e, delta, deltaX, deltaY) {
Ox.print('mwd', deltaX) Ox.print('mwd', deltaX);
// fixme: arbitrary
scrollToPosition(position + Math.round(deltaX * 2), true); scrollToPosition(position + Math.round(deltaX * 2), true);
} }
}); });