X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Faction.php;h=461121042236b32c80a04405961089f1e36a5f76;hb=62fb12b369bbcb4584ff9972074314ac72dd63b8;hp=d85ee25fb65377c5913f56787ae4b2accbc39ae9;hpb=0316e279d7dece61969e3f8d37401787786af9cd;p=quix0rs-gnu-social.git diff --git a/lib/action.php b/lib/action.php index d85ee25fb6..4611210422 100644 --- a/lib/action.php +++ b/lib/action.php @@ -229,7 +229,7 @@ class Action extends HTMLOutputter // lawsuit Event::handle('EndShowLaconicaStyles', array($this)); } - $this->cssLink(common_path('js/css/smoothness/jquery-ui.css')); + $this->cssLink(common_path('js/css/smoothness/jquery-ui.css', StatusNet::isHTTPS())); if (Event::handle('StartShowUAStyles', array($this))) { $this->comment('[if IE]>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->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.min.js', StatusNet::isHTTP()).'"); }'); $this->script('jquery.joverlay.min.js'); $this->script('jquery.infieldlabel.min.js'); } else { @@ -310,7 +310,7 @@ class Action extends HTMLOutputter // lawsuit $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->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.js', StatusNet::isHTTP()).'"); }'); $this->script('jquery.joverlay.js'); $this->script('jquery.infieldlabel.js'); }