Return-Path: 
 <commits-return-14025-apmail-cordova-commits-archive=cordova.apache.org@cordova.apache.org>
X-Original-To: apmail-cordova-commits-archive@www.apache.org
Delivered-To: apmail-cordova-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A4D72C2D8
	for <apmail-cordova-commits-archive@www.apache.org>;
 Wed, 19 Jun 2013 21:19:58 +0000 (UTC)
Received: (qmail 14792 invoked by uid 500); 19 Jun 2013 21:19:58 -0000
Delivered-To: apmail-cordova-commits-archive@cordova.apache.org
Received: (qmail 14749 invoked by uid 500); 19 Jun 2013 21:19:58 -0000
Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cordova.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cordova.apache.org>
List-Post: <mailto:commits@cordova.apache.org>
List-Id: <commits.cordova.apache.org>
Reply-To: dev@cordova.apache.org
Delivered-To: mailing list commits@cordova.apache.org
Received: (qmail 14725 invoked by uid 99); 19 Jun 2013 21:19:58 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Jun 2013 21:19:58 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 4108425DC5; Wed, 19 Jun 2013 21:19:58 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: filmaj@apache.org
To: commits@cordova.apache.org
Date: Wed, 19 Jun 2013 21:19:58 -0000
Message-Id: <b5f7b34c21184d1599c8acfa34c2273c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/3] js commit: more robust error handling.

Updated Branches:
  refs/heads/master 0f10e3a20 -> 1fd26e16e


more robust error handling.


Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/a945b9d5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/a945b9d5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/a945b9d5

Branch: refs/heads/master
Commit: a945b9d5cc8446a7acdf861ec46c4a89cd2fbac2
Parents: bd4cff0
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Tue May 21 18:14:57 2013 -0700
Committer: Fil Maj <maj.fil@gmail.com>
Committed: Wed Jun 19 13:32:07 2013 -0700

----------------------------------------------------------------------
 lib/scripts/plugin_loader.js | 85 +++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-js/blob/a945b9d5/lib/scripts/plugin_loader.js
----------------------------------------------------------------------
diff --git a/lib/scripts/plugin_loader.js b/lib/scripts/plugin_loader.js
index 1a38eda..b56f124 100644
--- a/lib/scripts/plugin_loader.js
+++ b/lib/scripts/plugin_loader.js
@@ -34,11 +34,21 @@
         }
     }
 
+    function scriptErrorCallback(err) {
+        // Open Question: If a script path specified in cordova_plugins.js does not exist, do we fail for all?
+        // this is currently just continuing.
+        scriptCounter--;
+        if (scriptCounter === 0) {
+            onScriptLoadingComplete && onScriptLoadingComplete();
+        }
+    }
+
     // Helper function to inject a <script> tag.
     function injectScript(path) {
         scriptCounter++;
         var script = document.createElement("script");
         script.onload = scriptLoadedCallback;
+        script.onerror = scriptErrorCallback;
         script.src = path;
         document.head.appendChild(script);
     }
@@ -50,10 +60,10 @@
         context.cordova.require('cordova/channel').onPluginsReady.fire();
     }
 
-    // Handler for the cordova_plugins.json content.
+    // Handler for the cordova_plugins.js content.
     // See plugman's plugin_loader.js for the details of this object.
     // This function is only called if the really is a plugins array that isn't empty.
-    // Otherwise the XHR response handler will just call finishPluginLoading().
+    // Otherwise the onerror response handler will just call finishPluginLoading().
     function handlePluginsObject(modules, path) {
         // First create the callback for when all plugins are loaded.
         var mapper = context.cordova.require('cordova/modulemapper');
@@ -61,26 +71,31 @@
             // Loop through all the plugins and then through their clobbers and merges.
             for (var i = 0; i < modules.length; i++) {
                 var module = modules[i];
-                if (!module) continue;
-
-                if (module.clobbers && module.clobbers.length) {
-                    for (var j = 0; j < module.clobbers.length; j++) {
-                        mapper.clobbers(module.id, module.clobbers[j]);
+                if (module) {
+                    try { 
+                        if (module.clobbers && module.clobbers.length) {
+                            for (var j = 0; j < module.clobbers.length; j++) {
+                                mapper.clobbers(module.id, module.clobbers[j]);
+                            }
+                        }
+
+                        if (module.merges && module.merges.length) {
+                            for (var k = 0; k < module.merges.length; k++) {
+                                mapper.merges(module.id, module.merges[k]);
+                            }
+                        }
+
+                        // Finally, if runs is truthy we want to simply require() the module.
+                        // This can be skipped if it had any merges or clobbers, though,
+                        // since the mapper will already have required the module.
+                        if (module.runs && !(module.clobbers && module.clobbers.length) && !(module.merges && module.merges.length)) {
+                            context.cordova.require(module.id);
+                        }
                     }
-                }
-
-                if (module.merges && module.merges.length) {
-                    for (var k = 0; k < module.merges.length; k++) {
-                        mapper.merges(module.id, module.merges[k]);
+                    catch(err) {
+                        // error with module, most likely clobbers, should we continue?
                     }
                 }
-
-                // Finally, if runs is truthy we want to simply require() the module.
-                // This can be skipped if it had any merges or clobbers, though,
-                // since the mapper will already have required the module.
-                if (module.runs && !(module.clobbers && module.clobbers.length) && !(module.merges && module.merges.length)) {
-                    context.cordova.require(module.id);
-                }
             }
 
             finishPluginLoading();
@@ -104,36 +119,18 @@
         }
     }
 
-    // // Try to XHR the cordova_plugins.json file asynchronously.
-    // var xhr = new XMLHttpRequest();
-    // xhr.onload = function() {
-    //     // If the response is a JSON string which composes an array, call handlePluginsObject.
-    //     // If the request fails, or the response is not a JSON array, just call finishPluginLoading.
-    //     var obj;
-    //     try {
-    //         obj = (this.status == 0 || this.status == 200) && this.responseText && JSON.parse(this.responseText);
-    //     } catch (err) {
-    //         // obj will be undefined.
-    //     }
-    //     if (Array.isArray(obj) && obj.length > 0) {
-    //         handlePluginsObject(obj, path);
-    //     } else {
-    //         finishPluginLoading();
-    //     }
-    // };
-    // xhr.onerror = function() {
-    //     finishPluginLoading();
-    // };
-
     var plugins_js = path + 'cordova_plugins.js';
-    try { // we commented we were going to try, so let us actually try and catch
-        //xhr.open('GET', plugins_json, true); // Async
-        //xhr.send();
+    try {
+        
         var script = document.createElement("script");
         script.onload = function(){
             var list = cordova.require("cordova/plugin_list");
             handlePluginsObject(list,path);
-
+        };
+        script.onerror = function() {
+            // Error loading cordova_plugins.js, file not found or something
+            // this is an acceptable error, pre-3.0.0, so we just move on.
+            finishPluginLoading();
         };
         script.src = plugins_js;
         document.head.appendChild(script);