Return-Path: 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 9A78910838 for ; Tue, 30 Apr 2013 00:26:57 +0000 (UTC) Received: (qmail 52257 invoked by uid 500); 30 Apr 2013 00:26:57 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 52235 invoked by uid 500); 30 Apr 2013 00:26:57 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 52228 invoked by uid 99); 30 Apr 2013 00:26:57 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Apr 2013 00:26:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 50264883D3B; Tue, 30 Apr 2013 00:26:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shazron@apache.org To: commits@cordova.apache.org Message-Id: <66c2795831a44cc6868e2b5da06360d9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: mac commit: Updated cordova-js for 2.7.0 Date: Tue, 30 Apr 2013 00:26:57 +0000 (UTC) Updated Branches: refs/heads/master 47a70f94c -> 65844a53d Updated cordova-js for 2.7.0 Project: http://git-wip-us.apache.org/repos/asf/cordova-osx/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-osx/commit/65844a53 Tree: http://git-wip-us.apache.org/repos/asf/cordova-osx/tree/65844a53 Diff: http://git-wip-us.apache.org/repos/asf/cordova-osx/diff/65844a53 Branch: refs/heads/master Commit: 65844a53d1fa84f4cd4ece05facdbc7488d1154c Parents: 47a70f9 Author: Shazron Abdullah Authored: Mon Apr 29 17:26:51 2013 -0700 Committer: Shazron Abdullah Committed: Mon Apr 29 17:26:51 2013 -0700 ---------------------------------------------------------------------- CordovaFramework/cordova.osx.js | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/65844a53/CordovaFramework/cordova.osx.js ---------------------------------------------------------------------- diff --git a/CordovaFramework/cordova.osx.js b/CordovaFramework/cordova.osx.js index a31a209..d386b3f 100644 --- a/CordovaFramework/cordova.osx.js +++ b/CordovaFramework/cordova.osx.js @@ -1,8 +1,8 @@ // Platform: osx -// commit 360bd3e65c33ce4f01e2efb82d641a565ef3c333 +// commit cd29cf0f224ccf25e9d422a33fd02ef67d3a78f4 -// File generated at :: Fri Apr 19 2013 18:36:10 GMT-0700 (PDT) +// File generated at :: Mon Apr 29 2013 16:14:48 GMT-0700 (PDT) /* Licensed to the Apache Software Foundation (ASF) under one @@ -6095,7 +6095,7 @@ window.cordova = require('cordova'); 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 = JSON.parse(this.responseText); + var obj = this.responseText && JSON.parse(this.responseText); if (obj && obj instanceof Array && obj.length > 0) { handlePluginsObject(obj); } else {