Skip to content

Commit

Permalink
Update monaca-core-utils to 2.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
takuyaW committed Aug 2, 2018
1 parent badf6d2 commit 666f10c
Show file tree
Hide file tree
Showing 4 changed files with 123 additions and 62 deletions.
90 changes: 62 additions & 28 deletions www/components/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,19 @@









/*** <Start:monaca-core-utils> ***/
/*** <Start:monaca-core-utils LoadJs:"components/monaca-core-utils/monaca-core-utils.js"> ***/
/**
* Monaca Core Utility Library
* This library requires cordova.js
*
* @version 2.0.4
* @version 2.0.7
* @author Asial Corporation
*/
window.monaca = window.monaca || {};
Expand All @@ -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],
Expand Down Expand Up @@ -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]
);
};
Expand Down Expand Up @@ -187,7 +193,7 @@ window.monaca = window.monaca || {};
};

var transitionPluginName = "Transit";

/**
* Open new page.
*/
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
}
Expand All @@ -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) {
Expand Down Expand Up @@ -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;
});


})();

/**
Expand Down Expand Up @@ -358,31 +391,31 @@ window.StatusBar = window.StatusBar || {};
monaca.apiQueue.exec(null, null, "mobi.monaca.nativecomponent", 'showStatusBar', []);
}

/*
/*
statusBarStyleDefault
support : iOS6,iOS7
*/
StatusBar.statusBarStyleDefault = function() {
monaca.apiQueue.exec(null, null, "mobi.monaca.nativecomponent", 'statusBarStyleDefault', []);
}

/*
/*
statusBarStyleLightContent
support : iOS7
*/
StatusBar.statusBarStyleLightContent = function() {
monaca.apiQueue.exec(null, null, "mobi.monaca.nativecomponent", 'statusBarStyleLightContent', []);
}

/*
/*
statusBarStyleBlackOpaque
support : iOS6
*/
StatusBar.statusBarStyleBlackOpaque = function() {
monaca.apiQueue.exec(null, null, "mobi.monaca.nativecomponent", 'statusBarStyleBlackOpaque', []);
}

/*
/*
statusBarStyleBlackTranslucent
support : iOS6
*/
Expand Down Expand Up @@ -427,8 +460,8 @@ window.monaca.cloud = window.monaca.cloud || {};
monaca.cloud.Push.callbackData = null;
}
}
};
};

})();


Expand Down Expand Up @@ -1448,5 +1481,6 @@ window.monaca.cloud = window.monaca.cloud || {};

})(window);

;
/*** <End:monaca-core-utils LoadJs:"components/monaca-core-utils/monaca-core-utils.js"> ***/
/*** <End:monaca-core-utils> ***/
/*** <End:monaca-core-utils> ***/
12 changes: 6 additions & 6 deletions www/components/monaca-core-utils/.bower.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -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
}
2 changes: 1 addition & 1 deletion www/components/monaca-core-utils/bower.json
Original file line number Diff line number Diff line change
@@ -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" : {
Expand Down
Loading

0 comments on commit 666f10c

Please sign in to comment.