Can now set $config['site']['minify'] = false; to use util.js and friends non-minifie...

diff --git a/lib/action.php b/lib/action.php
index 9b5f571c618fab02f28d9b4dc8ab9f8ef388494d..31e52dfcf26af0c713403949e89c5a5a49565bbd 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -295,7 +295,13 @@ class Action extends HTMLOutputter // lawsuit
             }
             if (Event::handle('StartShowStatusNetScripts', array($this)) &&
                 Event::handle('StartShowLaconicaScripts', array($this))) {
-                $this->script('util.min.js');
+                if (common_config('site', 'minify')) {
+                    $this->script('util.min.js');
+                } else {
+                    $this->script('util.js');
+                    $this->script('xbImportNode.js');
+                    $this->script('geometa.js');
+                }
                 $this->showScriptMessages();
                 // Frame-busting code to avoid clickjacking attacks.
                 $this->inlineScript('if (window.top !== window.self) { window.top.location.href = window.self.location.href; }');

diff --git a/lib/default.php b/lib/default.php
index 6090217d18c943987c1e52ba012931d45df48b50..c612557d69100c2264ba5d3d61bbcc8dacb3a503 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -63,6 +63,7 @@ $default =
               'use_x_sendfile' => false,
               'notice' => null, // site wide notice text
               'build' => 1, // build number, for code-dependent cache
+              'minify' => true, // true to use the minified versions of JS files; false to use orig files. Can aid during development
               ),
         'db' =>
         array('database' => 'YOU HAVE TO SET THIS IN config.php',