Return-Path: X-Original-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 97390B576 for ; Fri, 6 Jan 2012 23:53:24 +0000 (UTC) Received: (qmail 24754 invoked by uid 500); 6 Jan 2012 23:53:24 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 24714 invoked by uid 500); 6 Jan 2012 23:53:24 -0000 Mailing-List: contact callback-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@incubator.apache.org Delivered-To: mailing list callback-commits@incubator.apache.org Received: (qmail 24707 invoked by uid 99); 6 Jan 2012 23:53:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jan 2012 23:53:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jan 2012 23:53:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 38EB853199; Fri, 6 Jan 2012 23:52:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bowserj@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [10/10] git commit: Fix for issue #281 of phonegap/phonegap-android: Detect for localStorage if Java has disabled it Message-Id: <20120106235242.38EB853199@tyr.zones.apache.org> Date: Fri, 6 Jan 2012 23:52:42 +0000 (UTC) Fix for issue #281 of phonegap/phonegap-android: Detect for localStorage if Java has disabled it Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/05e233bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/05e233bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/05e233bf Branch: refs/heads/master Commit: 05e233bf1d6a1c5350a73a427485a49c1294a83a Parents: 36caaf3 Author: macdonst Authored: Wed Nov 23 03:39:27 2011 +0800 Committer: Joe Bowser Committed: Fri Nov 25 14:38:06 2011 -0800 ---------------------------------------------------------------------- framework/assets/js/storage.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/05e233bf/framework/assets/js/storage.js ---------------------------------------------------------------------- diff --git a/framework/assets/js/storage.js b/framework/assets/js/storage.js index cb741a9..47858c9 100755 --- a/framework/assets/js/storage.js +++ b/framework/assets/js/storage.js @@ -431,7 +431,7 @@ PhoneGap.addConstructor(function() { }; } - if (typeof window.localStorage === "undefined") { + if ((typeof window.localStorage == "undefined") || (window.localStorage == null)) { navigator.localStorage = window.localStorage = new CupcakeLocalStorage(); PhoneGap.waitForInitialization("cupcakeStorage"); }