0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

fix text scrolling

Browse source
This commit is contained in:
j 2013-11-04 14:10:13 +00:00
parent a71773ab01
commit 40d6b927e6
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
static/js/textPanel.js
View file

@ -168,8 +168,9 @@ pandora.ui.textPanel = function() {
that.replaceElement(1, $panel); that.replaceElement(1, $panel);
that.replaceElement(2, $statusbar); that.replaceElement(2, $statusbar);
embedURLs.length && that.selectEmbed(0); embedURLs.length && that.selectEmbed(0, false);
pandora.user.ui.texts[pandora.user.ui.text] &&
pandora.$ui.text.scrollTo(pandora.user.ui.texts[pandora.user.ui.text].position || 0);
}); });
function getEmbedURLs(text) { function getEmbedURLs(text) {
@ -192,14 +193,15 @@ pandora.ui.textPanel = function() {
pandora.$ui.text.scrollTo(position); pandora.$ui.text.scrollTo(position);
} }
that.selectEmbed = function(index) { that.selectEmbed = function(index, scroll) {
scroll = arguments.length == 1 || scroll;
if (index != selected) { if (index != selected) {
selected = index; selected = index;
selectedURL = embedURLs[selected] selectedURL = embedURLs[selected]
$('.OxSpecialLink').removeClass('OxActive'); $('.OxSpecialLink').removeClass('OxActive');
selected > -1 && $('#embed' + selected).addClass('OxActive'); selected > -1 && $('#embed' + selected).addClass('OxActive');
pandora.$ui.textEmbed.update(selectedURL); pandora.$ui.textEmbed.update(selectedURL);
scrollToSelectedEmbed(); scroll && scrollToSelectedEmbed();
} }
}; };
@ -229,7 +231,8 @@ pandora.ui.textHTML = function(text) {
scroll: function(event) { scroll: function(event) {
var position = Math.round(100 * that[0].scrollTop / that[0].scrollHeight) var position = Math.round(100 * that[0].scrollTop / that[0].scrollHeight)
position = position - position % 10; position = position - position % 10;
if (position != pandora.user.ui.texts[pandora.user.ui.text].position) { if (pandora.user.ui.texts[pandora.user.ui.text]
&& position != pandora.user.ui.texts[pandora.user.ui.text].position) {
pandora.UI.set( pandora.UI.set(
'texts.' + pandora.UI.encode(pandora.user.ui.text) + '.position', 'texts.' + pandora.UI.encode(pandora.user.ui.text) + '.position',
position ? position : 0 position ? position : 0
@ -322,9 +325,6 @@ pandora.ui.textHTML = function(text) {
}) })
.appendTo($content); .appendTo($content);
pandora.user.ui.texts[pandora.user.ui.text] &&
scrollTo(pandora.user.ui.texts[pandora.user.ui.text].position || 0);
function getHeight() { function getHeight() {
// 24 menu + 24 toolbar + 16 statusbar + 32 title + 32 margins // 24 menu + 24 toolbar + 16 statusbar + 32 title + 32 margins
// + 1px to ge trid of scrollbar // + 1px to ge trid of scrollbar