You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2013/07/12 22:13:03 UTC
git commit: [CB-4192] The defaults for the console plugin does not
log calls to the native logger
Updated Branches:
refs/heads/master 1c8c456e4 -> 944acbe20
[CB-4192] The defaults for the console plugin does not log calls to the native logger
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-console/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-console/commit/944acbe2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-console/tree/944acbe2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-console/diff/944acbe2
Branch: refs/heads/master
Commit: 944acbe20a2f20fe40240db8c614e32612569dc4
Parents: 1c8c456
Author: Shazron Abdullah <sh...@apache.org>
Authored: Fri Jul 12 13:12:56 2013 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Fri Jul 12 13:12:56 2013 -0700
----------------------------------------------------------------------
plugin.xml | 4 ----
www/logger-startup.js | 24 ------------------------
www/logger.js | 4 ++--
3 files changed, 2 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-console/blob/944acbe2/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 758e5b9..1f16952 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -23,10 +23,6 @@
<clobbers target="cordova.logger" />
</js-module>
- <js-module src="www/logger-startup.js" name="startup">
- <runs />
- </js-module>
-
<header-file src="src/ios/CDVLogger.h" />
<source-file src="src/ios/CDVLogger.m" />
http://git-wip-us.apache.org/repos/asf/cordova-plugin-console/blob/944acbe2/www/logger-startup.js
----------------------------------------------------------------------
diff --git a/www/logger-startup.js b/www/logger-startup.js
deleted file mode 100644
index d2a88c8..0000000
--- a/www/logger-startup.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.
- *
-*/
-
-// use the native logger
-var logger = require("./logger");
-logger.useConsole(true);
http://git-wip-us.apache.org/repos/asf/cordova-plugin-console/blob/944acbe2/www/logger.js
----------------------------------------------------------------------
diff --git a/www/logger.js b/www/logger.js
index 276cec4..0e838b5 100644
--- a/www/logger.js
+++ b/www/logger.js
@@ -45,7 +45,7 @@ var logger = exports;
var exec = require('cordova/exec');
var utils = require('cordova/utils');
-var UseConsole = true;
+var UseConsole = false;
var UseLogger = true;
var Queued = [];
var DeviceReady = false;
@@ -232,7 +232,7 @@ logger.logLevel = function(level /* , ... */) {
// Log using the console if that is enabled
if (UseConsole) {
// make sure console is not using logger
- if (console.__usingCordovaLogger) {
+ if (console.useLogger()) {
throw new Error("console and logger are too intertwingly");
}