Merge pull request #21 from gion/dev

Dev
gion · Sep 1, 2015 · d3f57a3 · d3f57a3
2 parents fb640ee + bb035cc
commit d3f57a3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/app/manifest.json b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appShortName__",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "manifest_version": 2,
   "description": "__MSG_appDescription__",
   "icons": {
@@ -32,8 +32,8 @@
   "content_scripts": [
     {
       "matches": [
-        "http://bitbucket.org/*pull-requests/*/*",
-        "https://bitbucket.org/*pull-requests/*/*"
+        "http://bitbucket.org/*pull-requests/*",
+        "https://bitbucket.org/*pull-requests/*"
       ],
       "css": [
         "styles/content.css"

diff --git a/app/scripts/api.js b/app/scripts/api.js
@@ -113,6 +113,11 @@ var api = (function() {
 
     run: function() {
 
+      // do not run on the multiple pull requests page
+      if(util.isPullRequestsListingPage()) {
+        return;
+      }
+
       $('html').addClass('bitship-enabled');
 
       api.settings = util.storage.get(function(settings) {

diff --git a/app/scripts/util.js b/app/scripts/util.js
@@ -16,6 +16,11 @@ var util = (function() {
         this.data = this.data || data || {};
         chrome.storage.sync.set({bitShip: JSON.stringify(this.data)}, callback);
       }
+    },
+
+    isPullRequestsListingPage: function() {
+      // this element should be available oly on multiple pull request page
+      return !!document.getElementById('list-pullrequests');
     }
   };
   return util;