Skip to content

Commit

Permalink
retain scroll position when switching editor modes; updates #202
Browse files Browse the repository at this point in the history
  • Loading branch information
@following5
following5 committed Sep 8, 2015
1 parent ff969f6 commit db30747
Show file tree
Hide file tree
Showing 15 changed files with 54 additions and 5 deletions.
3 changes: 3 additions & 0 deletions htdocs/editdesc.php
View file
Expand Up @@ -291,6 +291,9 @@
} }
} }


tpl_set_var('scrollposx', isset($_REQUEST['scrollposx']) ? $_REQUEST['scrollposx'] + 0 : 0);
tpl_set_var('scrollposy', isset($_REQUEST['scrollposy']) ? $_REQUEST['scrollposy'] + 0 : 0);

//make the template and send it out //make the template and send it out
tpl_BuildTemplate(); tpl_BuildTemplate();
?> ?>
3 changes: 3 additions & 0 deletions htdocs/editlog.php
View file
Expand Up @@ -395,6 +395,9 @@
} }
} }


tpl_set_var('scrollposx', isset($_REQUEST['scrollposx']) ? $_REQUEST['scrollposx'] + 0 : 0);
tpl_set_var('scrollposy', isset($_REQUEST['scrollposy']) ? $_REQUEST['scrollposy'] + 0 : 0);

//make the template and send it out //make the template and send it out
tpl_BuildTemplate(); tpl_BuildTemplate();
?> ?>
2 changes: 2 additions & 0 deletions htdocs/lang/de/ocstyle/editdesc.tpl.php
View file
Expand Up @@ -38,6 +38,8 @@
<input type="hidden" name="version2" value="1"/> <input type="hidden" name="version2" value="1"/>
<input id="descMode" type="hidden" name="descMode" value="1" /> <input id="descMode" type="hidden" name="descMode" value="1" />
<input id="oldDescMode" type="hidden" name="oldDescMode" value="1" /> <input id="oldDescMode" type="hidden" name="oldDescMode" value="1" />
<input type="hidden" name="scrollposx" value="{scrollposx}" />
<input type="hidden" name="scrollposy" value="{scrollposy}" />
<table class="table"> <table class="table">
<tr> <tr>
<td>{t}Language:{/t}</td> <td>{t}Language:{/t}</td>
Expand Down
2 changes: 2 additions & 0 deletions htdocs/lang/de/ocstyle/editlog.tpl.php
View file
Expand Up @@ -83,6 +83,8 @@ function _chkFound () {
<input type="hidden" name="version2" value="1"/> <input type="hidden" name="version2" value="1"/>
<input id="oldDescMode" type="hidden" name="oldDescMode" value="1" /> <input id="oldDescMode" type="hidden" name="oldDescMode" value="1" />
<input id="descMode" type="hidden" name="descMode" value="1" /> <input id="descMode" type="hidden" name="descMode" value="1" />
<input type="hidden" name="scrollposx" value="{scrollposx}" />
<input type="hidden" name="scrollposy" value="{scrollposy}" />


<table class="table"> <table class="table">
<tr><td class="spacer" colspan="2"></td></tr> <tr><td class="spacer" colspan="2"></td></tr>
Expand Down
4 changes: 3 additions & 1 deletion htdocs/lang/de/ocstyle/newcache.tpl.php
View file
Expand Up @@ -126,6 +126,8 @@ function toggleAttr(id)
<input type="hidden" id="cache_attribs" name="cache_attribs" value="{cache_attribs}" /> <input type="hidden" id="cache_attribs" name="cache_attribs" value="{cache_attribs}" />
<input id="descMode" type="hidden" name="descMode" value="1" /> <input id="descMode" type="hidden" name="descMode" value="1" />
<input id="oldDescMode" type="hidden" name="oldDescMode" value="1" /> <input id="oldDescMode" type="hidden" name="oldDescMode" value="1" />
<input type="hidden" name="scrollposx" value="{scrollposx}" />
<input type="hidden" name="scrollposy" value="{scrollposy}" />
<table class="table"> <table class="table">
{general_message} {general_message}
<tr><td class="spacer" colspan="2"></td></tr> <tr><td class="spacer" colspan="2"></td></tr>
Expand Down Expand Up @@ -248,7 +250,7 @@ function toggleAttr(id)
<td colspan="2">{cache_attrib_list}{safari_message}</td> <td colspan="2">{cache_attrib_list}{safari_message}</td>
</tr> </tr>
<tr><td class="spacer" colspan="2">&nbsp;</td></tr> <tr><td class="spacer" colspan="2">&nbsp;</td></tr>
<tr id="editor"> <tr>
<td class="header-small" colspan="2"> <td class="header-small" colspan="2">
<div class="content2-container bg-blue02"> <div class="content2-container bg-blue02">
<p class="content-title-noshade-size2"> <p class="content-title-noshade-size2">
Expand Down
2 changes: 2 additions & 0 deletions htdocs/lang/de/ocstyle/newdesc.tpl.php
View file
Expand Up @@ -37,6 +37,8 @@
<input type="hidden" name="version2" value="1"/> <input type="hidden" name="version2" value="1"/>
<input id="descMode" type="hidden" name="descMode" value="1" /> <input id="descMode" type="hidden" name="descMode" value="1" />
<input id="oldDescMode" type="hidden" name="oldDescMode" value="1" /> <input id="oldDescMode" type="hidden" name="oldDescMode" value="1" />
<input type="hidden" name="scrollposx" value="{scrollposx}" />
<input type="hidden" name="scrollposy" value="{scrollposy}" />
<table class="table"> <table class="table">
<tr><td class="spacer" colspan="2"></td></tr> <tr><td class="spacer" colspan="2"></td></tr>
<tr> <tr>
Expand Down
2 changes: 2 additions & 0 deletions htdocs/log.php
View file
Expand Up @@ -279,6 +279,8 @@
} }


// prepare template and display // prepare template and display
$tpl->assign('scrollposx', isset($_REQUEST['scrollposx']) ? $_REQUEST['scrollposx'] + 0 : 0);
$tpl->assign('scrollposy', isset($_REQUEST['scrollposy']) ? $_REQUEST['scrollposy'] + 0 : 0);
$tpl->assign('validate', $validate); $tpl->assign('validate', $validate);
$tpl->display(); $tpl->display();
?> ?>
2 changes: 2 additions & 0 deletions htdocs/mydetails.php
View file
Expand Up @@ -114,6 +114,8 @@ function changetext()
{ {
$tpl->name = 'mydescription'; $tpl->name = 'mydescription';
assignFromDB($login->userid,true); assignFromDB($login->userid,true);
$tpl->assign('scrollposx', isset($_REQUEST['scrollposx']) ? $_REQUEST['scrollposx'] + 0 : 0);
$tpl->assign('scrollposy', isset($_REQUEST['scrollposy']) ? $_REQUEST['scrollposy'] + 0 : 0);
$tpl->display(); $tpl->display();
} }
} }
Expand Down
3 changes: 3 additions & 0 deletions htdocs/mylists.php
View file
Expand Up @@ -195,6 +195,9 @@
$tpl->assign('descMode', $descMode); $tpl->assign('descMode', $descMode);
$tpl->assign('list_caches', $list_caches); $tpl->assign('list_caches', $list_caches);


$tpl->assign('scrollposx', isset($_REQUEST['scrollposx']) ? $_REQUEST['scrollposx'] + 0 : 0);
$tpl->assign('scrollposy', isset($_REQUEST['scrollposy']) ? $_REQUEST['scrollposy'] + 0 : 0);

$tpl->display(); $tpl->display();


?> ?>
5 changes: 4 additions & 1 deletion htdocs/newcache.php
View file
Expand Up @@ -944,7 +944,10 @@


if ($no_tpl_build == false) if ($no_tpl_build == false)
{ {
//make the template and send it out tpl_set_var('scrollposx', isset($_REQUEST['scrollposx']) ? $_REQUEST['scrollposx'] + 0 : 0);
tpl_set_var('scrollposy', isset($_REQUEST['scrollposy']) ? $_REQUEST['scrollposy'] + 0 : 0);

// make the template and send it out
tpl_BuildTemplate(); tpl_BuildTemplate();
} }
?> ?>
3 changes: 3 additions & 0 deletions htdocs/newdesc.php
View file
Expand Up @@ -233,6 +233,9 @@
} }
} }


tpl_set_var('scrollposx', isset($_REQUEST['scrollposx']) ? $_REQUEST['scrollposx'] + 0 : 0);
tpl_set_var('scrollposy', isset($_REQUEST['scrollposy']) ? $_REQUEST['scrollposy'] + 0 : 0);

//make the template and send it out //make the template and send it out
tpl_BuildTemplate(); tpl_BuildTemplate();
?> ?>
22 changes: 19 additions & 3 deletions htdocs/templates2/ocstyle/js/editor.js
View file
Expand Up @@ -16,6 +16,9 @@


function OcInitEditor() function OcInitEditor()
{ {
if (document.editform.scrollposx.value + document.editform.scrollposy.value != 0)
window.scrollTo(document.editform.scrollposx.value, document.editform.scrollposy.value);

document.getElementById("scriptwarning").firstChild.nodeValue = ""; document.getElementById("scriptwarning").firstChild.nodeValue = "";
document.getElementById("oldDescMode").value = descMode; document.getElementById("oldDescMode").value = descMode;
if (descMode == 3) if (descMode == 3)
Expand Down Expand Up @@ -122,13 +125,26 @@
if (switchfield != null) if (switchfield != null)
switchfield.value = "1"; switchfield.value = "1";


if (document.getElementById("editor")) saveScrollPos();
document.editform.action += '#editor';

document.editform.submit(); document.editform.submit();
} }
} }


function saveScrollPos()
{
if (window.pageXOffset != undefined)
{
document.editform.scrollposx.value = window.pageXOffset;
document.editform.scrollposy.value = window.pageYOffset;
}
else
{
var d = document, r = d.documentElement, b = d.body;
d.editform.scrollposx.value = r.scrollLeft || b.scrollLeft || 0;
d.editform.scrollposy.value = r.scrollTop || b.scrollTop || 0;
}
}

function btnMouseOver(id) function btnMouseOver(id)
{ {
switch (id) switch (id)
Expand Down
2 changes: 2 additions & 0 deletions htdocs/templates2/ocstyle/log_cache.tpl
View file
Expand Up @@ -84,6 +84,8 @@ function _chkFound () {
<input type="hidden" name="version3" value="1"/> <input type="hidden" name="version3" value="1"/>
<input id="descMode" type="hidden" name="descMode" value="1" /> <input id="descMode" type="hidden" name="descMode" value="1" />
<input id="oldDescMode" type="hidden" name="oldDescMode" value="1" /> <input id="oldDescMode" type="hidden" name="oldDescMode" value="1" />
<input type="hidden" name="scrollposx" value="{$scrollposx}" />
<input type="hidden" name="scrollposy" value="{$scrollposy}" />
<table class="table"> <table class="table">
<tr><td class="spacer" colspan="2"></td></tr> <tr><td class="spacer" colspan="2"></td></tr>
<tr><td colspan="2"></td></tr> <tr><td colspan="2"></td></tr>
Expand Down
2 changes: 2 additions & 0 deletions htdocs/templates2/ocstyle/mydescription.tpl
View file
Expand Up @@ -14,6 +14,8 @@
<input type="hidden" name="action" value="changetext" /> <input type="hidden" name="action" value="changetext" />
<input id="descMode" type="hidden" name="descMode" value="3" /> <input id="descMode" type="hidden" name="descMode" value="3" />
<input id="oldDescMode" type="hidden" name="oldDescMode" value="3" /> <input id="oldDescMode" type="hidden" name="oldDescMode" value="3" />
<input type="hidden" name="scrollposx" value="{$scrollposx}" />
<input type="hidden" name="scrollposy" value="{$scrollposy}" />


<p>{t}The following text is displayed in your <a href="viewprofile.php">public profile</a>:{/t}</p> <p>{t}The following text is displayed in your <a href="viewprofile.php">public profile</a>:{/t}</p>


Expand Down
2 changes: 2 additions & 0 deletions htdocs/templates2/ocstyle/mylists.tpl
View file
Expand Up @@ -54,6 +54,8 @@
<input id="oldDescMode" type="hidden" name="oldDescMode" value="3" /> <input id="oldDescMode" type="hidden" name="oldDescMode" value="3" />
<input type="hidden" id="switchDescMode" name="switchDescMode" value="0" /> <input type="hidden" id="switchDescMode" name="switchDescMode" value="0" />
{if $fromsearch}<input type="hidden" name="fromsearch" value="{$fromsearch}" />{/if} {if $fromsearch}<input type="hidden" name="fromsearch" value="{$fromsearch}" />{/if}
<input type="hidden" name="scrollposx" value="{$scrollposx}" />
<input type="hidden" name="scrollposy" value="{$scrollposy}" />


<table class="table" id="addlist" {if !($name_error || $edit_list || $newlist_mode)}style="display:none"{/if}> <table class="table" id="addlist" {if !($name_error || $edit_list || $newlist_mode)}style="display:none"{/if}>
<tr><td class="separator"></td></tr> <tr><td class="separator"></td></tr>
Expand Down

0 comments on commit db30747

Please sign in to comment.