Chris,
Will you take care of merging this to the trunk ? If not, please
don't close the issues (or open a specific one for 3.1 + link them).
Thanks
g
On Jul 3, 2007, at 15:56 , [EMAIL PROTECTED] wrote:
Revision9902AuthorcminerDate2007-07-03 15:56:45 +0200 (Tue, 03 Jul
2007)Log Messagefixes MAGNOLIA-800 add and remove parameter from
url now respects existance of anchor in url. mgnlUpdateCK is now
based on these add and remove functions.Modified Paths
magnolia/branches/magnolia-3.0/magnolia-module-admininterface/src/
main/resources/mgnl-resources/admin-js/general.js
magnolia/branches/magnolia-3.0/magnolia-module-admininterface/src/
main/resources/mgnl-resources/admin-js/generic.js
Diff
Modified: magnolia/branches/magnolia-3.0/magnolia-module-
admininterface/src/main/resources/mgnl-resources/admin-js/
general.js (9901 => 9902)--- magnolia/branches/magnolia-3.0/
magnolia-module-admininterface/src/main/resources/mgnl-resources/
admin-js/general.js 2007-07-03 13:39:08 UTC (rev 9901) +++ magnolia/
branches/magnolia-3.0/magnolia-module-admininterface/src/main/
resources/mgnl-resources/admin-js/general.js 2007-07-03 13:56:45
UTC (rev 9902)@@ -328,18 +328,12 @@ function mgnlUpdateCK(href)
{- if (!href) href=document.location.href; - tmp=href.split
("?") - var href2=tmp[0]+"?mgnlCK="+new Date().getTime(); -
if (tmp[1]) - { - var qs=tmp[1].split("&"); -
for (var elem=0; elem<qs.length; elem++) -
{ - if (qs[elem].indexOf("mgnlCK=")!=0) href2+="&"+qs
[elem]; - } - } - return href2;+ if (!href)
+ href=document.location.href; + + href =
mgnlRemoveParameter(href, 'mgnlCK'); + href = mgnlAddParameter
(href, 'mgnlCK', new Date().getTime()); + return href; }
Modified: magnolia/branches/magnolia-3.0/magnolia-module-
admininterface/src/main/resources/mgnl-resources/admin-js/
generic.js (9901 => 9902)--- magnolia/branches/magnolia-3.0/
magnolia-module-admininterface/src/main/resources/mgnl-resources/
admin-js/generic.js 2007-07-03 13:39:08 UTC (rev 9901) +++ magnolia/
branches/magnolia-3.0/magnolia-module-admininterface/src/main/
resources/mgnl-resources/admin-js/generic.js 2007-07-03 13:56:45
UTC (rev 9902)@@ -152,34 +152,28 @@ ### add/remove parameter to
query string ################################### */ -function
mgnlAddParameter(href,name,value) - {+function mgnlAddParameter
(href, name, value) +{ + var anchorSplit = href.split("#"); +
var anchor = (anchorSplit.length == 2) ? "#"+anchorSplit[1] : "";
+ href=anchorSplit[0]; + var delimiter;- if (href.indexOf
("?")==-1) delimiter="?"; - else delimiter="&"; - return href
+delimiter+name+"="+value; - }+ if (href.indexOf("?") == -1)
+ delimiter = "?"; + else + delimiter = "&";
+ + return href + delimiter + name + "=" + value +
anchor; +} -function mgnlRemoveParameter(href,name)+function
mgnlRemoveParameter(href, name) {- //works only for a single
paramter - /* - var nameExtended; - var delimiter - var
tmp; - if (href.indexOf("?"+name+"=")!=-1) delimiter="?"; -
else delimiter="&";+ var anchorSplit = href.split("#"); + var
anchor = (anchorSplit.length == 2) ? "#"+anchorSplit[1] : ""; -
var tmp=href.split(delimiter+name+"="); - var href2=tmp[0]; -
if (tmp[1]) - { - if (tmp[1].indexOf("&")!=-1) href2
+=delimiter+tmp[1].substring(tmp[1].indexOf("&")+1); - }
- return href2; - */ -+ href=anchorSplit[0]; var
tmp=href.split("?"); var newHref=tmp[0];@@ -206,6 +200,6
@@ } } - return newHref;+ return newHref + anchor; }
----------------------------------------------------------------
for list details see
http://documentation.magnolia.info/docs/en/editor/stayupdated.html
----------------------------------------------------------------
