URL is now filled automatically if RESTClient APS is opened from POA …

…tab.
odin-public · Apr 13, 2015 · 84c8bd0 · 84c8bd0
1 parent 939d26a
commit 84c8bd0
Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/src/content/js/restclient.helper.js b/src/content/js/restclient.helper.js
@@ -155,6 +155,32 @@ restclient.helper = {
 
     return parts.protocol + parts.doubleSlash + parts.authority + parts.pathname + search;
   },
+  getQuery: function(href) {
+    var param = typeof href === 'string';
+    do {
+      var tmp = (param ? href : decodeURI(window.location.search)),
+        tmp1,
+        result = {};
+      if (!tmp.length)
+        break;
+      tmp = tmp.split('?');
+      if (tmp.length === 1)
+        break;
+      tmp = tmp[tmp.length - 1];
+      if (!tmp.length)
+        break;
+      tmp.split('&').forEach(function(v) {
+        tmp = v.indexOf('=');
+        if (tmp === 0)
+          return;
+        if (tmp === -1)
+          result[v] = '';
+        else
+          result[v.slice(0, tmp)] = v.slice(tmp + 1);
+      });
+    } while (false);
+    return result;
+  },
   validateUrl: function (url) {
     return this.isAbsoluteUrl(url);
   },

diff --git a/src/content/js/restclient.main.js b/src/content/js/restclient.main.js
@@ -495,6 +495,11 @@ restclient.main = {
       $('#request-url').val($(this).data('url'));
       restclient.main.updateFavoriteUrlIcon();
     });
+    var queryObject = restclient.helper.getQuery();
+    if (queryObject.url) {
+      $('#request-url').val(queryObject.url + 'aps/2/resources/');
+      history.pushState({}, '', location.origin + location.pathname + location.hash);      
+    }
   },
   getCachedUrls: function () {
     if (restclient.main.cachedUrls)

diff --git a/src/content/js/restclient.overlay.js b/src/content/js/restclient.overlay.js
@@ -113,7 +113,7 @@ restclient.overlay = {
   },
   open: function(){
     var browser = restclient.overlay.getBrowser();
-    browser.selectedTab = browser.addTab("chrome://restclient/content/restclient.html");
+    browser.selectedTab = browser.addTab('chrome://restclient/content/restclient.html' + (browser.contentDocument.querySelector('script[src^="/pem/common/js/pem.js"]') ? '?url=' + browser.currentURI.specIgnoringRef : ''));
   }
 }
 window.addEventListener("load", function(){ restclient.overlay.init();  }, false);