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 2AE931095F for ; Thu, 31 Oct 2013 00:50:51 +0000 (UTC) Received: (qmail 40387 invoked by uid 500); 31 Oct 2013 00:50:51 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 40278 invoked by uid 500); 31 Oct 2013 00:50:50 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 40259 invoked by uid 99); 31 Oct 2013 00:50:50 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Oct 2013 00:50:50 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2C0248A075A; Thu, 31 Oct 2013 00:50:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: purplecabbage@apache.org To: commits@cordova.apache.org Date: Thu, 31 Oct 2013 00:50:50 -0000 Message-Id: <61b8611bbfad4f7f984e063627b9b330@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] js commit: windows8 - cleanup and moved window.alert stuff to platform init Updated Branches: refs/heads/2.9.x d138f5d6c -> 835f00ec9 windows8 - cleanup and moved window.alert stuff to platform init Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/5d699b7c Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/5d699b7c Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/5d699b7c Branch: refs/heads/2.9.x Commit: 5d699b7c1e191b827540729d4047710affafc70e Parents: d138f5d Author: purplecabbage Authored: Wed Oct 30 14:30:17 2013 -0700 Committer: purplecabbage Committed: Wed Oct 30 14:30:17 2013 -0700 ---------------------------------------------------------------------- lib/windows8/platform.js | 3 ++ lib/windows8/plugin/windows8/console.js | 46 -------------------- lib/windows8/plugin/windows8/console/symbols.js | 24 ---------- .../plugin/windows8/notification/plugininit.js | 23 ---------- 4 files changed, 3 insertions(+), 93 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-js/blob/5d699b7c/lib/windows8/platform.js ---------------------------------------------------------------------- diff --git a/lib/windows8/platform.js b/lib/windows8/platform.js index 3b3076a..37f331f 100755 --- a/lib/windows8/platform.js +++ b/lib/windows8/platform.js @@ -44,6 +44,9 @@ module.exports = { modulemapper.mapModules(window); + window.alert = window.alert || require("cordova/plugin/notification").alert; + window.confirm = window.confirm || require("cordova/plugin/notification").confirm; + var onWinJSReady = function () { var app = WinJS.Application; var checkpointHandler = function checkpointHandler() { http://git-wip-us.apache.org/repos/asf/cordova-js/blob/5d699b7c/lib/windows8/plugin/windows8/console.js ---------------------------------------------------------------------- diff --git a/lib/windows8/plugin/windows8/console.js b/lib/windows8/plugin/windows8/console.js deleted file mode 100644 index a71a2c5..0000000 --- a/lib/windows8/plugin/windows8/console.js +++ /dev/null @@ -1,46 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * -*/ - - -if(!console || !console.log) -{ - var exec = require('cordova/exec'); - - var debugConsole = { - log:function(msg){ - exec(null,null,"DebugConsole","log",msg); - }, - warn:function(msg){ - exec(null,null,"DebugConsole","warn",msg); - }, - error:function(msg){ - exec(null,null,"DebugConsole","error",msg); - } - }; - - module.exports = debugConsole; -} -else if(console && console.log) { - - console.log("console.log exists already!"); - console.warn = console.warn || function(msg){console.log("warn:"+msg);}; - console.error = console.error || function(msg){console.log("error:"+msg);}; -} http://git-wip-us.apache.org/repos/asf/cordova-js/blob/5d699b7c/lib/windows8/plugin/windows8/console/symbols.js ---------------------------------------------------------------------- diff --git a/lib/windows8/plugin/windows8/console/symbols.js b/lib/windows8/plugin/windows8/console/symbols.js deleted file mode 100644 index c91f429..0000000 --- a/lib/windows8/plugin/windows8/console/symbols.js +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * -*/ - - -var modulemapper = require('cordova/modulemapper'); - -modulemapper.clobbers('cordova/plugin/windows8/console', 'navigator.console'); http://git-wip-us.apache.org/repos/asf/cordova-js/blob/5d699b7c/lib/windows8/plugin/windows8/notification/plugininit.js ---------------------------------------------------------------------- diff --git a/lib/windows8/plugin/windows8/notification/plugininit.js b/lib/windows8/plugin/windows8/notification/plugininit.js deleted file mode 100644 index 38ba60f..0000000 --- a/lib/windows8/plugin/windows8/notification/plugininit.js +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * -*/ - -window.alert = window.alert || require("cordova/plugin/notification").alert; -window.confirm = window.confirm || require("cordova/plugin/notification").confirm; -