diff options
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 5 | ||||
| -rw-r--r-- | lib/utils.coffee | 6 | ||||
| -rw-r--r-- | tests/dom_tests/chrome.coffee | 3 |
4 files changed, 11 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 60c79466..6d2a9d80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,5 +7,7 @@ script: "cake test" notifications: email: false branches: - only: - - master + except: + - experimental + - 1.42 + - commands diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 685bf750..13de1617 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -52,5 +52,6 @@ CREDITS file with your patch. ## Coding Style - * Follow the style already present in the file. - * Ensure your lines don't exceed 110 characters. + * We follow the recommendations from + [this style guide](https://github.com/polarmobile/coffeescript-style-guide). + * The one major difference is that we wrap our lines at 110 characters instead of 80. diff --git a/lib/utils.coffee b/lib/utils.coffee index 04f5d909..8d588a43 100644 --- a/lib/utils.coffee +++ b/lib/utils.coffee @@ -1,10 +1,6 @@ Utils = getCurrentVersion: -> - # Chromium #15242 will make this XHR request to access the manifest unnecessary - manifestRequest = new XMLHttpRequest() - manifestRequest.open("GET", chrome.extension.getURL("manifest.json"), false) - manifestRequest.send(null) - JSON.parse(manifestRequest.responseText).version + chrome.runtime.getManifest().version # Takes a dot-notation object string and call the function # that it points to with the correct value for 'this'. diff --git a/tests/dom_tests/chrome.coffee b/tests/dom_tests/chrome.coffee index c8ec9d29..71d0c572 100644 --- a/tests/dom_tests/chrome.coffee +++ b/tests/dom_tests/chrome.coffee @@ -17,4 +17,7 @@ root.chrome = { } sendMessage: -> } + runtime: { + getManifest: -> + } } |