aboutsummaryrefslogtreecommitdiffstats
path: root/core/js/js.js
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2013-01-02 08:17:28 -0800
committerJörn Friedrich Dreyer <jfd@butonic.de>2013-01-02 08:17:28 -0800
commit166da88b73df7720cd7d6a29924bd3beb45af375 (patch)
treeeb0f2650824401f40abfc2c44e18eb22146288b6 /core/js/js.js
parent54f6f1e6b7de3c5ce2414c9f436af1defa6c3c78 (diff)
parent5b07e722cbee3582fd461c83f5978001d94da7f8 (diff)
downloadnextcloud-server-166da88b73df7720cd7d6a29924bd3beb45af375.tar.gz
nextcloud-server-166da88b73df7720cd7d6a29924bd3beb45af375.zip
Merge pull request #945 from owncloud/fix_app_management_in_ie8
since @tanghus and @DeepDiver1975 gave me their :+1: I'll merge this now: Fix app management in ie8
Diffstat (limited to 'core/js/js.js')
-rw-r--r--core/js/js.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/js/js.js b/core/js/js.js
index 7d967321d93..610950995db 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -3,14 +3,15 @@
* Add
* define('DEBUG', true);
* To the end of config/config.php to enable debug mode.
+ * The undefined checks fix the broken ie8 console
*/
-if (oc_debug !== true) {
+if (oc_debug !== true || typeof console === "undefined" || typeof console.log === "undefined") {
if (!window.console) {
window.console = {};
}
var methods = ['log', 'debug', 'warn', 'info', 'error', 'assert'];
for (var i = 0; i < methods.length; i++) {
- console[methods[i]] = function () { };
+ console[methods[i]] = function () { };
}
}
@@ -20,7 +21,6 @@ if (oc_debug !== true) {
* @param text the string to translate
* @return string
*/
-
function t(app,text, vars){
if( !( t.cache[app] )){
$.ajax(OC.filePath('core','ajax','translations.php'),{