Dev Fixed erroneous include for response browsing

Added HoverIntent plugin to superfish package
LimeSurvey · Mar 21, 2013 · cdd6d1f · cdd6d1f
1 parent 0484616
commit cdd6d1f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/application/config/third_party.php b/application/config/third_party.php
@@ -65,7 +65,8 @@
     'jquery-superfish' => array(
         'baseUrl' => 'third_party/jquery-superfish',
         'js' => array(
-            'js/superfish.js'
+            'js/superfish.js',
+            'js/hoverIntent.js'
         ),
         'css' => array(
             'css/superfish.css'

diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
@@ -536,7 +536,6 @@ function _surveybar($iSurveyID, $gid=null)
         //$surveyinfo = array_map('htmlspecialchars', $surveyinfo);
         $activated = ($surveyinfo['active'] == 'Y');
 
-        $js_admin_includes[] = Yii::app()->getConfig('generalscripts') . 'jquery/hoverIntent.js';
         App()->getClientScript()->registerPackage('jquery-superfish');
         App()->getClientScript()->registerPackage('jquery-cookie');
         App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'surveytoolbar.js');
@@ -895,11 +894,7 @@ function _browsemenubar($iSurveyID, $title='')
         $aData['sImageURL'] = Yii::app()->getConfig("adminimageurl");
         $aData['clang'] = Yii::app()->lang;
         $aData['surveyid'] = $iSurveyID;
-        $js_admin_includes[] = Yii::app()->getConfig('generalscripts') . 'jquery/superfish.js';
-        $js_admin_includes[] = Yii::app()->getConfig('generalscripts') . 'jquery/hoverIntent.js';
-        App()->getClientScript()->registerScriptFile($js_admin_includes);
-        $this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl')."superfish.css");
-
+        App()->getClientScript()->registerPackage('jquery-superfish');
 
         $tmp_survlangs = Survey::model()->findByPk($iSurveyID)->additionalLanguages;
         $baselang = Survey::model()->findByPk($iSurveyID)->language;