From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Mar 2011 13:56:26 +0000 (-0400)
Subject: Merge branch 'jqueryui' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=41420449f8316bd461a5136df25db46c045d0757;p=quix0rs-gnu-social.git

Merge branch 'jqueryui' into 1.0.x

Conflicts:
	lib/action.php
---

41420449f8316bd461a5136df25db46c045d0757
diff --cc lib/action.php
index fce59ba8a0,7614f4be3a..12464c2c68
--- a/lib/action.php
+++ b/lib/action.php
@@@ -293,19 -295,12 +295,21 @@@ class Action extends HTMLOutputter // l
      {
          if (Event::handle('StartShowScripts', array($this))) {
              if (Event::handle('StartShowJQueryScripts', array($this))) {
 -                $this->script('jquery.min.js');
 -                $this->script('jquery.form.min.js');
 -                $this->script('jquery-ui.min.js');
 -                $this->script('jquery.cookie.min.js');
 -                $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.min.js').'"); }');
 -                $this->script('jquery.joverlay.min.js');
 +                if (common_config('site', 'minify')) {
 +                    $this->script('jquery.min.js');
 +                    $this->script('jquery.form.min.js');
++                    $this->script('jquery-ui.min.js');
 +                    $this->script('jquery.cookie.min.js');
 +                    $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.min.js').'"); }');
 +                    $this->script('jquery.joverlay.min.js');
 +                } else {
 +                    $this->script('jquery.js');
 +                    $this->script('jquery.form.js');
++                    $this->script('jquery-ui.min.js');
 +                    $this->script('jquery.cookie.js');
 +                    $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.js').'"); }');
 +                    $this->script('jquery.joverlay.js');
 +                }
                  Event::handle('EndShowJQueryScripts', array($this));
              }
              if (Event::handle('StartShowStatusNetScripts', array($this)) &&