diff options
| author | Klap-in <klapinklapin@gmail.com> | 2013-08-01 23:06:36 +0200 |
|---|---|---|
| committer | Klap-in <klapinklapin@gmail.com> | 2013-08-01 23:06:36 +0200 |
| commit | de489e8bb4161522864aca1d308b9910387ae4bb (patch) | |
| tree | 697a6ca1a6a3341598a6272dca6e5cf0ee4cd105 /lib/exe | |
| parent | cc036f74ff14c387f24d72f5a52f2f158208846e (diff) | |
| parent | 4fb6e51447e840624b59742bec61641d606f5006 (diff) | |
| download | rpg-de489e8bb4161522864aca1d308b9910387ae4bb.tar.gz rpg-de489e8bb4161522864aca1d308b9910387ae4bb.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into fetchimagetokexternal
Diffstat (limited to 'lib/exe')
| -rw-r--r-- | lib/exe/css.php | 2 | ||||
| -rw-r--r-- | lib/exe/js.php | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/exe/css.php b/lib/exe/css.php index 1e662c64a..768c8eda4 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -314,7 +314,7 @@ function css_datauri($match){ $data = base64_encode(file_get_contents($local)); } if($data){ - $url = 'data:image/'.$ext.';base64,'.$data; + $url = '\'data:image/'.$ext.';base64,'.$data.'\''; }else{ $url = $base.$url; } diff --git a/lib/exe/js.php b/lib/exe/js.php index 4ff48133e..06769d895 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -104,10 +104,13 @@ function js_out(){ // load files foreach($files as $file){ $ismin = (substr($file,-7) == '.min.js'); + $debugjs = ($conf['allowdebug'] && strpos($file, DOKU_INC.'lib/scripts/') !== 0); echo "\n\n/* XXXXXXXXXX begin of ".str_replace(DOKU_INC, '', $file) ." XXXXXXXXXX */\n\n"; if($ismin) echo "\n/* BEGIN NOCOMPRESS */\n"; + if ($debugjs) echo "\ntry {\n"; js_load($file); + if ($debugjs) echo "\n} catch (e) {\n logError(e, '".str_replace(DOKU_INC, '', $file)."');\n}\n"; if($ismin) echo "\n/* END NOCOMPRESS */\n"; echo "\n\n/* XXXXXXXXXX end of " . str_replace(DOKU_INC, '', $file) . " XXXXXXXXXX */\n\n"; } |