From tchemit@users.nuiton.org Fri Aug 31 12:08:01 2012
From: tchemit@users.nuiton.org
To: mavenpom-commits@list.nuiton.org
Subject: [Mavenpom-commits] r1327 - trunk/src/static-site/resources/js
Date: Fri, 31 Aug 2012 12:08:01 +0200
Message-ID: <20120831100801.B8DC2162E8@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5224901201987806344=="

--===============5224901201987806344==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: tchemit
Date: 2012-08-31 12:08:01 +0200 (Fri, 31 Aug 2012)
New Revision: 1327

Url: http://nuiton.org/repositories/revision/mavenpom/1327

Log:
refs #2241: improve common js

Modified:
   trunk/src/static-site/resources/js/mavenpom-site.js

Modified: trunk/src/static-site/resources/js/mavenpom-site.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/static-site/resources/js/mavenpom-site.js	2012-08-30 14:43:38 U=
TC (rev 1326)
+++ trunk/src/static-site/resources/js/mavenpom-site.js	2012-08-31 10:08:01 U=
TC (rev 1327)
@@ -39,19 +39,38 @@
     var scmwebeditorenabled =3D metas.attr('scmwebeditorenabled');
     var scm =3D metas.attr('scm');
     if (scmwebeditorenabled &&
-        scm.indexOf("/trunk") > -1 &&
-        scm.indexOf("/branches") > -1) {
+        (scm.indexOf("/trunk") > -1 ||
+         scm.indexOf("/branches") > -1)) {
=20
         // allow scmwebeditor is enabled and on trunk
=20
         // remove scm prefix (scm:svn:)
         scm =3D scm.replace('scm:svn:', '');
=20
+        scm =3D scm.replace('/SNAPSHOT', '');
+
         var scmurl =3D metas.attr('scmwebeditorurl');
         var projectId =3D metas.attr('projectId');
         var siteSourcesType =3D metas.attr('siteSourcesType');
+        var locale =3D metas.attr('locale');
         var path;
         var pathname =3D document.location.pathname;
+
+        // remove /SNAPSHOT from path
+        pathname =3D pathname.replace('/SNAPSHOT', '');
+
+        var localeInPath;
+        if (pathname.indexOf('/' + locale) > -1) {
+
+            // locale detected in path (means not default locale)
+            // remove locale from path
+            pathname =3D pathname.replace('/' + locale, '');
+            localeInPath =3D locale + '/';
+        } else {
+
+            // means default locale, no need to set it in svn url
+            localeInPath =3D "";
+        }
         if (pathname.indexOf('target/site') > 0) {
             path =3D pathname.substr(pathname.indexOf('/site')).
                     replace('/site/', '');
@@ -65,7 +84,7 @@
             }
         }
         path =3D path.replace('.html', '.' + siteSourcesType);
-        var url =3D scmurl + "?address=3D" + scm + "/src/site/" + siteSource=
sType + "/" + path;
+        var url =3D scmurl + "?address=3D" + scm + "/src/site/" + localeInPa=
th + siteSourcesType + "/" + path;
         console.log("Add scmwebeditor with url =3D " + url);
         var html =3D "<li class=3D'pull-right'><a href=3D'" + url +
                    "'>=C3=89diter la page</a></li>" +


--===============5224901201987806344==--