mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #945 from owncloud/fix_app_management_in_ie8 

since @tanghus and @DeepDiver1975 gave me their 👍 I'll merge this now: Fix app management in ie8
This commit is contained in:
Jörn Friedrich Dreyer 2013-01-02 08:17:28 -08:00
parent 54f6f1e6b7 5b07e722cb
commit 166da88b73
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/js/js.js
View File

@ -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'),{

2
settings/templates/apps.php
View File

@ -15,7 +15,7 @@
<li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>" <?php if ( isset( $app['ocs_id'] ) ) { echo "data-id-ocs=\"{$app['ocs_id']}\""; } ?>
data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1">
<a class="app<?php if(!$app['internal']) echo ' externalapp' ?>" href="?appid=<?php echo $app['id'] ?>"><?php echo htmlentities($app['name']) ?></a>
<script type="application/javascript">
<script>
appData_<?php echo $app['id'] ?>=<?php OC_JSON::encodedPrint($app, false) ?>;
</script>
<?php if(!$app['internal']) echo '<small class="externalapp list">3rd party</small>' ?>