Merge branch 'dev'

Author: gera2ld

src/background/db.js

@@ -399,12 +399,20 @@ define('vmdb', function (require, _exports, module) {
     var requests = {};
     return function (url) {
       var _this = this;
-      return requests[url]
-      || (requests[url] = scriptUtils.fetch(url).then(function (res) {
-        return _this.saveRequire(url, res.responseText);
-      }).then(function () {
-        delete requests[url];
-      }));
+      var promise = requests[url];
+      if (!promise) {
+        promise = requests[url] = scriptUtils.fetch(url)
+        .then(function (res) {
+          return _this.saveRequire(url, res.responseText);
+        })
+        .catch(function () {
+          opera.postError('Error fetching required script: ' + url);
+        })
+        .then(function () {
+          delete requests[url];
+        });
+      }
+      return promise;
     };
   }();
 

src/background/utils/script.js

@@ -1,20 +1,18 @@
 define('utils/script', function (_require, _exports, module) {
   var scriptUtils = module.exports = {
     isRemote: function (url) {
-      return url && !/^(file|data):/.test(url);
+      return url && !(/^(file|data):/.test(url));
     },
     fetch: function (url, type, headers) {
       var xhr = new XMLHttpRequest;
       xhr.open('GET', url, true);
       if (type) xhr.responseType = type;
-      if (headers) for (var k in headers)
+      if (headers) for (var k in headers) {
         xhr.setRequestHeader(k, headers[k]);
+      }
       return new Promise(function (resolve, reject) {
-        xhr.onload = function () {
-          resolve(this);
-        };
-        xhr.onerror = function () {
-          reject(this);
+        xhr.onloadend = function () {
+          (xhr.status > 300 ? reject : resolve)(xhr);
         };
         xhr.send();
       });

src/includes/injected.js

@@ -130,6 +130,7 @@ if (document.contentType !== 'text/html' && /\.user\.js$/i.test(window.location.
       'close',
       'confirm',
       'dispatchEvent',
+      'fetch',
       'find',
       'focus',
       'getComputedStyle',
@@ -142,6 +143,7 @@ if (document.contentType !== 'text/html' && /\.user\.js$/i.test(window.location.
       'postMessage',
       'print',
       'prompt',
+      'requestAnimationFrame',
       'removeEventListener',
       'resizeBy',
       'resizeTo',
@@ -155,7 +157,7 @@ if (document.contentType !== 'text/html' && /\.user\.js$/i.test(window.location.
       'stop',
     ], function (name) {
       var method = window[name];
-      wrapper[name] = function () {
+      if (method) wrapper[name] = function () {
         return method.apply(window, arguments);
       };
     });
@@ -216,11 +218,11 @@ if (document.contentType !== 'text/html' && /\.user\.js$/i.test(window.location.
       if (func) func(obj.data);
     },
     runCode: function(name, func, wrapper) {
-      try{
-        func.call(wrapper.window, wrapper);
-      }catch(e){
+      try {
+        func.call(wrapper.window || wrapper, wrapper);
+      } catch (e) {
         var msg = 'Error running script: ' + name + '\n' + e;
-        if(e.message) msg += '\n' + e.message;
+        if (e.message) msg += '\n' + e.message;
         console.error(msg);
       }
     },

src/options/views/confirm.js

@@ -125,20 +125,18 @@ define('views/Confirm', function (require, _exports, module) {
       xhr.open('GET', url, true);
       if (isBlob) xhr.responseType = 'blob';
       return new Promise(function (resolve, reject) {
-        xhr.onload = function () {
+        xhr.onloadend = function () {
+          if (xhr.status > 300) return reject(url);
           if (isBlob) {
             var reader = new FileReader;
             reader.onload = function (_e) {
               resolve(window.btoa(this.result));
             };
-            reader.readAsBinaryString(this.response);
+            reader.readAsBinaryString(xhr.response);
           } else {
             resolve(xhr.responseText);
           }
         };
-        xhr.onerror = function () {
-          reject(url);
-        };
         xhr.send();
       });
     },
@@ -148,17 +146,10 @@ define('views/Confirm', function (require, _exports, module) {
         var text = cache.get(url);
         return text ? resolve(text) : reject();
       }).catch(function () {
-        return new Promise(function (resolve, reject) {
-          var xhr = new _.bg.XMLHttpRequest;
-          xhr.open('GET', url, true);
-          xhr.onload = function () {
-            resolve(this.responseText);
-          };
-          xhr.onerror = xhr.ontimeout = function () {
-            _this.showMessage(_.i18n('msgErrorLoadingData'));
-            reject(this);
-          };
-          xhr.send();
+        return _this.getFile(url)
+        .catch(function () {
+          _this.showMessage(_.i18n('msgErrorLoadingData'));
+          return Promise.reject();
         });
       });
     },