From 666f10c374707cf950b22b88d213086693baed7f Mon Sep 17 00:00:00 2001 From: takuya Date: Thu, 2 Aug 2018 21:54:18 +0900 Subject: [PATCH] Update monaca-core-utils to 2.0.7 --- www/components/loader.js | 90 +++++++++++++------ www/components/monaca-core-utils/.bower.json | 12 +-- www/components/monaca-core-utils/bower.json | 2 +- .../monaca-core-utils/monaca-core-utils.js | 81 +++++++++++------ 4 files changed, 123 insertions(+), 62 deletions(-) diff --git a/www/components/loader.js b/www/components/loader.js index b57b1b7..3d6e410 100644 --- a/www/components/loader.js +++ b/www/components/loader.js @@ -57,13 +57,19 @@ + + + + + + /*** ***/ /*** ***/ /** * Monaca Core Utility Library * This library requires cordova.js * - * @version 2.0.4 + * @version 2.0.7 * @author Asial Corporation */ window.monaca = window.monaca || {}; @@ -86,11 +92,11 @@ window.monaca = window.monaca || {}; if (params) { window.cordova.exec( function(r) { - if (typeof params[0] === 'function') params[0](r); + if (typeof params[0] === 'function') params[0](r); monaca.apiQueue.next(); }, function(r) { - if (typeof params[1] === 'function') params[1](r); + if (typeof params[1] === 'function') params[1](r); monaca.apiQueue.next(); }, params[2], @@ -135,27 +141,27 @@ window.monaca = window.monaca || {}; } } }; - + if (isAndroid) { monaca.retrieveUIStyle = function(id, name, success, failure) { monaca.apiQueue.exec( - function(style) { success(style[name]); } || function() { }, - failure || function() { }, + function(style) { success(style[name]); } || function() { }, + failure || function() { }, "mobi.monaca.nativecomponent", - "retrieve", + "retrieve", [id] ); }; - + monaca.updateUIStyle = function(id, name, value, success, failure) { var style = {}; style[name] = value; - + monaca.apiQueue.exec( - success || function() { }, - failure || function() { }, + success || function() { }, + failure || function() { }, "mobi.monaca.nativecomponent", - "update", + "update", [id, style] ); }; @@ -187,7 +193,7 @@ window.monaca = window.monaca || {}; }; var transitionPluginName = "Transit"; - + /** * Open new page. */ @@ -223,7 +229,7 @@ window.monaca = window.monaca || {}; monaca.apiQueue.exec(null, null, transitionPluginName, "browse", [url]); }; - /** + /** * Load in current page. */ monaca.load = function(path, options, param) { @@ -263,15 +269,22 @@ window.monaca = window.monaca || {}; } else { message = JSON.stringify(arguments[i]); } + if (message === undefined) { + message = "undefined"; + } if (isIOS) { - var head = message.substr(0, 5); - if (window.monaca.isDeviceReady !== true || (head != 'ERROR' && head != 'WARN:')) { - var xhr = new XMLHttpRequest(); - var path = "monaca://log?level=" + encodeURIComponent(level) + "&message=" + encodeURIComponent(message); - xhr.open("GET", path); - xhr.send(); + // not checked yet or confirmed MonacaDebugger + if (! monaca.isMonacaDebuggerChecked || monaca.isMonacaDebugger ) { + var head = message.substr(0, 5); + if (window.monaca.isDeviceReady !== true || (head != 'ERROR' && head != 'WARN:')) { + var xhr = new XMLHttpRequest(); + var path = "https://monaca-debugger.local/log?level=" + encodeURIComponent(level) + "&message=" + encodeURIComponent(message) + "&at=" + (new Date()).getTime(); + xhr.open("GET", path); + xhr.send(); + } } + window.orig_console[level](message); } else { window.console[level](message); } @@ -290,10 +303,17 @@ window.monaca = window.monaca || {}; }; }(method); } - + /** Replace window.console if iOS **/ if (isIOS) { + window.orig_console = window.console; window.console = window.monaca.console; + window.addEventListener( "error" , function (desc, page, line, char) { + monaca.console.sendLog("error", null, null, null, [ { "message" : desc.message , "page" : desc.filename , "line" : desc.lineno , "char" : desc.colno } ]); + } , false ); + // window.onerror = function (desc, page, line, char) { + // monaca.console.sendLog("error", page, line, char, [ { "message" : desc , "page" : page , "line" : line, "char" : char } ] ); + // }; } /* Comment out for now window.onerror = function (desc, page, line, char) { @@ -330,6 +350,19 @@ window.monaca = window.monaca || {}; monaca.apiQueue.exec(function(result) { callback(result.deviceId); }, null, "Monaca", "getRuntimeConfiguration", []); }; + monaca.getRuntimeConfiguration = function(success,failure) { + monaca.apiQueue.exec( success , failure , "Monaca" , "getRuntimeConfiguration" , []); + }; + + monaca.isMonacaDebuggerChecked = false; + monaca.isMonacaDebugger = null; + + monaca.getRuntimeConfiguration( function(result) { + monaca.isMonacaDebuggerChecked = true; + monaca.isMonacaDebugger = !! result.isMonacaDebugger; + }); + + })(); /** @@ -358,7 +391,7 @@ window.StatusBar = window.StatusBar || {}; monaca.apiQueue.exec(null, null, "mobi.monaca.nativecomponent", 'showStatusBar', []); } - /* + /* statusBarStyleDefault support : iOS6,iOS7 */ @@ -366,7 +399,7 @@ window.StatusBar = window.StatusBar || {}; monaca.apiQueue.exec(null, null, "mobi.monaca.nativecomponent", 'statusBarStyleDefault', []); } - /* + /* statusBarStyleLightContent support : iOS7 */ @@ -374,7 +407,7 @@ window.StatusBar = window.StatusBar || {}; monaca.apiQueue.exec(null, null, "mobi.monaca.nativecomponent", 'statusBarStyleLightContent', []); } - /* + /* statusBarStyleBlackOpaque support : iOS6 */ @@ -382,7 +415,7 @@ window.StatusBar = window.StatusBar || {}; monaca.apiQueue.exec(null, null, "mobi.monaca.nativecomponent", 'statusBarStyleBlackOpaque', []); } - /* + /* statusBarStyleBlackTranslucent support : iOS6 */ @@ -427,8 +460,8 @@ window.monaca.cloud = window.monaca.cloud || {}; monaca.cloud.Push.callbackData = null; } } - }; - + }; + })(); @@ -1448,5 +1481,6 @@ window.monaca.cloud = window.monaca.cloud || {}; })(window); +; /*** ***/ -/*** ***/ +/*** ***/ \ No newline at end of file diff --git a/www/components/monaca-core-utils/.bower.json b/www/components/monaca-core-utils/.bower.json index de20470..66ff77b 100644 --- a/www/components/monaca-core-utils/.bower.json +++ b/www/components/monaca-core-utils/.bower.json @@ -1,6 +1,6 @@ { "name": "monaca-core-utils", - "version": "2.0.4", + "version": "2.0.7", "description": "Monaca core APIs necessary for running Monaca apps.", "main": "monaca-core-utils.js", "monaca": { @@ -25,14 +25,14 @@ "test", "README.md" ], - "_release": "2.0.4", + "_release": "2.0.7", "_resolution": { "type": "version", - "tag": "2.0.4", - "commit": "7bd0a7aaf1c750ca8525a1159e15fd2e98ae9ba7" + "tag": "2.0.7", + "commit": "a926ded5370d938773ba6c23bb5131f46d66b9b1" }, - "_source": "git://github.com/monaca/monaca-component-monaca-core-utils.git", - "_target": "~2.0.4", + "_source": "https://github.com/monaca/monaca-component-monaca-core-utils.git", + "_target": "2.0.7", "_originalSource": "monaca-core-utils", "_direct": true } \ No newline at end of file diff --git a/www/components/monaca-core-utils/bower.json b/www/components/monaca-core-utils/bower.json index f5751c5..1ad8e70 100644 --- a/www/components/monaca-core-utils/bower.json +++ b/www/components/monaca-core-utils/bower.json @@ -1,6 +1,6 @@ { "name": "monaca-core-utils", - "version": "2.0.4", + "version": "2.0.7", "description": "Monaca core APIs necessary for running Monaca apps.", "main": "monaca-core-utils.js", "monaca" : { diff --git a/www/components/monaca-core-utils/monaca-core-utils.js b/www/components/monaca-core-utils/monaca-core-utils.js index 4b7d7e0..176fc68 100644 --- a/www/components/monaca-core-utils/monaca-core-utils.js +++ b/www/components/monaca-core-utils/monaca-core-utils.js @@ -2,7 +2,7 @@ * Monaca Core Utility Library * This library requires cordova.js * - * @version 2.0.4 + * @version 2.0.7 * @author Asial Corporation */ window.monaca = window.monaca || {}; @@ -25,11 +25,11 @@ window.monaca = window.monaca || {}; if (params) { window.cordova.exec( function(r) { - if (typeof params[0] === 'function') params[0](r); + if (typeof params[0] === 'function') params[0](r); monaca.apiQueue.next(); }, function(r) { - if (typeof params[1] === 'function') params[1](r); + if (typeof params[1] === 'function') params[1](r); monaca.apiQueue.next(); }, params[2], @@ -74,27 +74,27 @@ window.monaca = window.monaca || {}; } } }; - + if (isAndroid) { monaca.retrieveUIStyle = function(id, name, success, failure) { monaca.apiQueue.exec( - function(style) { success(style[name]); } || function() { }, - failure || function() { }, + function(style) { success(style[name]); } || function() { }, + failure || function() { }, "mobi.monaca.nativecomponent", - "retrieve", + "retrieve", [id] ); }; - + monaca.updateUIStyle = function(id, name, value, success, failure) { var style = {}; style[name] = value; - + monaca.apiQueue.exec( - success || function() { }, - failure || function() { }, + success || function() { }, + failure || function() { }, "mobi.monaca.nativecomponent", - "update", + "update", [id, style] ); }; @@ -126,7 +126,7 @@ window.monaca = window.monaca || {}; }; var transitionPluginName = "Transit"; - + /** * Open new page. */ @@ -162,7 +162,7 @@ window.monaca = window.monaca || {}; monaca.apiQueue.exec(null, null, transitionPluginName, "browse", [url]); }; - /** + /** * Load in current page. */ monaca.load = function(path, options, param) { @@ -202,15 +202,22 @@ window.monaca = window.monaca || {}; } else { message = JSON.stringify(arguments[i]); } + if (message === undefined) { + message = "undefined"; + } if (isIOS) { - var head = message.substr(0, 5); - if (window.monaca.isDeviceReady !== true || (head != 'ERROR' && head != 'WARN:')) { - var xhr = new XMLHttpRequest(); - var path = "monaca://log?level=" + encodeURIComponent(level) + "&message=" + encodeURIComponent(message); - xhr.open("GET", path); - xhr.send(); + // not checked yet or confirmed MonacaDebugger + if (! monaca.isMonacaDebuggerChecked || monaca.isMonacaDebugger ) { + var head = message.substr(0, 5); + if (window.monaca.isDeviceReady !== true || (head != 'ERROR' && head != 'WARN:')) { + var xhr = new XMLHttpRequest(); + var path = "https://monaca-debugger.local/log?level=" + encodeURIComponent(level) + "&message=" + encodeURIComponent(message) + "&at=" + (new Date()).getTime(); + xhr.open("GET", path); + xhr.send(); + } } + window.orig_console[level](message); } else { window.console[level](message); } @@ -229,10 +236,17 @@ window.monaca = window.monaca || {}; }; }(method); } - + /** Replace window.console if iOS **/ if (isIOS) { + window.orig_console = window.console; window.console = window.monaca.console; + window.addEventListener( "error" , function (desc, page, line, char) { + monaca.console.sendLog("error", null, null, null, [ { "message" : desc.message , "page" : desc.filename , "line" : desc.lineno , "char" : desc.colno } ]); + } , false ); + // window.onerror = function (desc, page, line, char) { + // monaca.console.sendLog("error", page, line, char, [ { "message" : desc , "page" : page , "line" : line, "char" : char } ] ); + // }; } /* Comment out for now window.onerror = function (desc, page, line, char) { @@ -269,6 +283,19 @@ window.monaca = window.monaca || {}; monaca.apiQueue.exec(function(result) { callback(result.deviceId); }, null, "Monaca", "getRuntimeConfiguration", []); }; + monaca.getRuntimeConfiguration = function(success,failure) { + monaca.apiQueue.exec( success , failure , "Monaca" , "getRuntimeConfiguration" , []); + }; + + monaca.isMonacaDebuggerChecked = false; + monaca.isMonacaDebugger = null; + + monaca.getRuntimeConfiguration( function(result) { + monaca.isMonacaDebuggerChecked = true; + monaca.isMonacaDebugger = !! result.isMonacaDebugger; + }); + + })(); /** @@ -297,7 +324,7 @@ window.StatusBar = window.StatusBar || {}; monaca.apiQueue.exec(null, null, "mobi.monaca.nativecomponent", 'showStatusBar', []); } - /* + /* statusBarStyleDefault support : iOS6,iOS7 */ @@ -305,7 +332,7 @@ window.StatusBar = window.StatusBar || {}; monaca.apiQueue.exec(null, null, "mobi.monaca.nativecomponent", 'statusBarStyleDefault', []); } - /* + /* statusBarStyleLightContent support : iOS7 */ @@ -313,7 +340,7 @@ window.StatusBar = window.StatusBar || {}; monaca.apiQueue.exec(null, null, "mobi.monaca.nativecomponent", 'statusBarStyleLightContent', []); } - /* + /* statusBarStyleBlackOpaque support : iOS6 */ @@ -321,7 +348,7 @@ window.StatusBar = window.StatusBar || {}; monaca.apiQueue.exec(null, null, "mobi.monaca.nativecomponent", 'statusBarStyleBlackOpaque', []); } - /* + /* statusBarStyleBlackTranslucent support : iOS6 */ @@ -366,8 +393,8 @@ window.monaca.cloud = window.monaca.cloud || {}; monaca.cloud.Push.callbackData = null; } } - }; - + }; + })();