Dev Javascript rename folder.

Dev Fixed some erroneous includes.
LimeSurvey · Aug 7, 2013 · bba0dc8 · bba0dc8
1 parent 1d6fa9d
commit bba0dc8
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 4 deletions.
diff --git a/application/config/third_party.php b/application/config/third_party.php
@@ -161,4 +161,13 @@
             'jquery'
         )
     ),
+	'jquery-actual' => array(
+        'baseUrl' => 'third_party/jquery-actual/',
+        'js' => array(
+            'jquery.actual.min.js'
+        ),
+        'depends' => array(
+            'jquery'
+        )
+    ),
 );
diff --git a/application/controllers/admin/dataentry.php b/application/controllers/admin/dataentry.php
@@ -881,7 +881,7 @@ public function editdata($subaction, $id, $surveyid, $language='')
                             }
                             $aDataentryoutput .="</div>";
                             $aDataentryoutput .= '</div>';
-                            App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.actual/jquery.actual.min.js');
+                            App()->getClientScript()->registerPackage('jquery-actual');
                             App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'ranking.js');
                             App()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl') . 'ranking.css');
                             $aDataentryoutput .= "<script type='text/javascript'>\n"
@@ -2134,7 +2134,7 @@ public function view($surveyid, $lang=NULL)
                                     $answers[] = $ansrow;
                                 }
                             $cdata['answers']=$answers;
-                            App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.actual/jquery.actual.min.js');
+                            App()->getClientScript()->registerPackage('jquery-actual');
                             App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'ranking.js');
                             App()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl') . 'ranking.css');
                             unset($answers);

diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
@@ -2085,9 +2085,9 @@ function do_ranking($ia)
         $answer.="<div id=\"htmlblock-{$ia['0']}-{$ansrow['code']}\">{$ansrow['answer']}</div>";
     }
     $answer .="</div>";
-    Yii::app()->getClientScript()->registerScriptFile(App()->baseUrl."/third_party/jquery.actual/jquery.actual.min.js"); // Needed to with jq1.9 ?
+    App()->getClientScript()->registerPackage('jquery-actual'); // Needed to with jq1.9 ?
     Yii::app()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts')."ranking.js");
-    Yii::app()->getClientScript()->registerCssFile("ranking.css");
+    Yii::app()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl') . "ranking.css");
 
     if(trim($aQuestionAttributes['choice_title'][$clang->langcode]) != '')
     {

diff --git a/third_party/jquery.actual/.gitignore → third_party/jquery-actual/.gitignore b/third_party/jquery.actual/.gitignore → third_party/jquery-actual/.gitignore
diff --git a/third_party/jquery.actual/CHANGELOG.md → third_party/jquery-actual/CHANGELOG.md b/third_party/jquery.actual/CHANGELOG.md → third_party/jquery-actual/CHANGELOG.md
diff --git a/third_party/jquery.actual/LICENSE.txt → third_party/jquery-actual/LICENSE.txt b/third_party/jquery.actual/LICENSE.txt → third_party/jquery-actual/LICENSE.txt
diff --git a/third_party/jquery.actual/README.md → third_party/jquery-actual/README.md b/third_party/jquery.actual/README.md → third_party/jquery-actual/README.md
diff --git a/third_party/jquery.actual/demo/PIE.htc → third_party/jquery-actual/demo/PIE.htc b/third_party/jquery.actual/demo/PIE.htc → third_party/jquery-actual/demo/PIE.htc
diff --git a/third_party/jquery.actual/demo/css3pie.html → third_party/jquery-actual/demo/css3pie.html b/third_party/jquery.actual/demo/css3pie.html → third_party/jquery-actual/demo/css3pie.html
diff --git a/third_party/jquery.actual/demo/normal.html → third_party/jquery-actual/demo/normal.html b/third_party/jquery.actual/demo/normal.html → third_party/jquery-actual/demo/normal.html
diff --git a/third_party/jquery.actual/jquery.actual.js → third_party/jquery-actual/jquery.actual.js b/third_party/jquery.actual/jquery.actual.js → third_party/jquery-actual/jquery.actual.js
diff --git a/..._party/jquery.actual/jquery.actual.min.js → ..._party/jquery-actual/jquery.actual.min.js b/..._party/jquery.actual/jquery.actual.min.js → ..._party/jquery-actual/jquery.actual.min.js
diff --git a/third_party/jquery.actual/package.json → third_party/jquery-actual/package.json b/third_party/jquery.actual/package.json → third_party/jquery-actual/package.json