From: Kristian K. Nielsen <jkkn@jkkn.dk>
Date: Sun, 7 Mar 2010 05:29:31 +0000 (+0100)
Subject: Regex got too greety - fixed
X-Git-Url: https://git.jkkn.net/?a=commitdiff_plain;h=c5c892c283a30fe5675237e39ae7ff8061569546;p=tv2developer

Regex got too greety - fixed
---

diff --git a/content/tv2developer.js b/content/tv2developer.js
index 565b9f9..bb5db12 100644
--- a/content/tv2developer.js
+++ b/content/tv2developer.js
@@ -200,8 +200,8 @@ var TV2Developer = {
     },
  
     /* Main function for adding all the links for the menu popup */   
-    _reg_tv2: /^https?:\/\/([^/.]*)?(\.([^/]*?))?(\.(robot|opdatering|template)\.?)?(\.(php4|php5)\.?)?(\.((test3?|snapshot3?|stage))\.)?tv2\.dk((\/[^#\?]*).*)?$/,
-    _reg_branchuser: /(([^.]*?)\.)?([^.]*)/,
+    _reg_tv2: /^https?:\/\/([^/.]*)?([^/]*?)(\.(robot|opdatering|template)\.?)?(\.(php4|php5)\.?)?(\.((test3?|snapshot3?|stage))\.)?tv2\.dk((\/[^#\?]*).*)?$/,
+    _reg_branchuser: /^\.(([^.]*?)\.)?([^.]*)/,
     _reg_php: /^(.*\.php)/,
     _reg_nodeid: /([0-9]{2,})/g,
     _reg_i2files: /\/([0-9]+)-/,
@@ -223,13 +223,13 @@ var TV2Developer = {
         if (tv2 && !fromgitweb) {
             var skip_treenodes = false;
             var tv2_sitename = tv2[1];
-            var tv2_branchuser   = tv2[3];
-            var tv2_sitetype = tv2[5];
-			var tv2_apptype  = tv2[7]; // php4 or php5
-            var tv2_testsite = tv2[9];
-            var tv2_testtype = tv2[10]; /* no 3 */
-            var tv2_uri      = tv2[11];
-            var tv2_uriOnly  = tv2[12]; // no parameters, anchers
+            var tv2_branchuser = tv2[2];
+            var tv2_sitetype = tv2[4];
+			var tv2_apptype  = tv2[6]; // php4 or php5
+            var tv2_testsite = tv2[8];
+            var tv2_testtype = tv2[9]; /* no 3 */
+            var tv2_uri      = tv2[10];
+            var tv2_uriOnly  = tv2[11]; // no parameters, anchers
 
             // Strip -dyn and -static
             if (tv2_sitename) tv2_sitename = tv2_sitename.replace(/-(dyn|static)$/, '');
@@ -254,7 +254,7 @@ var TV2Developer = {
 						tv2_user = bc[3];
 					}
 				} else { // we do not have usernames on snapshot/stage, so this is the branch
-					tv2_branch = tv2_branchuser;
+					tv2_branch = tv2_branchuser.replace(/^\./, '');
 				}
 			}
 			
diff --git a/version b/version
index ebf55b3..5daaa7b 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.13.6
+0.13.7