# Fixed issue with splash screen not storing a new state within the

window # Moved the javascript files to their correct location according to joomla specifications
JoomFish · Feb 3, 2013 · ef779a7 · ef779a7
1 parent ba59b4f
commit ef779a7
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 15 deletions.
diff --git a/admin/assets/js/index.html b/admin/assets/js/index.html
diff --git a/admin/controllers/cpanel.php b/admin/controllers/cpanel.php
@@ -90,11 +90,11 @@ public function saveconfig() {
 		JRequest::checkToken() or jexit( 'Invalid Token' );
 
 		$jinput = JFactory::getApplication()->input;
-		$viewLayout	= $jinput->get('post');
+		$viewLayout	= $jinput->getArray(array('params'=>''));
 		$msg = '';
 		$config = JComponentHelper::getParams( 'com_joomfish' );
-		if($post != null && array_key_exists('params', $post)) {
-			$params = $post['params']; 
+		if($viewLayout != null && array_key_exists('params', $viewLayout)) {
+			$params = $viewLayout['params']; 
 			if($params != null && count($params)>0) {
 
 				foreach ($params as $key => $value) {

diff --git a/admin/views/cpanel/view.php b/admin/views/cpanel/view.php
@@ -60,7 +60,7 @@ public function display($tpl = null)
 
 		$document = JFactory::getDocument();
 		$document->setTitle(JText::_('JOOMFISH_TITLE') . ' :: ' .JText::_( 'COM_JOOMFISH_CONTROL_PANEL' ));
-		JHTML::script('/administrator/components/com_joomfish/assets/js/joomfish.mootools.js', true);
+		JHTML::script('com_joomfish/joomfish.mootools.js', true, true);
 
 		// Set toolbar items for the page
 		JToolBarHelper::title( JText::_('JOOMFISH_TITLE') .' :: '. JText::_( 'JOOMFISH_HEADER' ), 'fish' );

diff --git a/admin/views/default/view.php b/admin/views/default/view.php
@@ -66,7 +66,7 @@ public function display($tpl=null)
 		$document = JFactory::getDocument();
 		$livesite = JURI::base();
 		$document->addStyleSheet($livesite.'components/com_joomfish/assets/css/joomfish.css');
-		$document->addScript($livesite.'components/com_joomfish/assets/js/joomfish.mootools.js');
+		JHTML::script('com_joomfish/joomfish.mootools.js', true, true);
 
 		// Get data from the model
 		$state		= $this->get('State');

diff --git a/admin/views/languages/view.php b/admin/views/languages/view.php
@@ -129,11 +129,10 @@ public function display($tpl = null)
 	public function translateConfig($tpl = null) {
 		$document = JFactory::getDocument();
 		$livesite = JURI::base();
-		JHtml::_('behavior.mootools');
-		JHtml::_('behavior.modal');
 		$document->addStyleSheet($livesite.'components/com_joomfish/assets/css/joomfish.css');
-		$document->addScript($livesite.'components/com_joomfish/assets/js/joomfish.mootools.js');
-
+		JHtml::_('behavior.modal');
+		JHTML::script('com_joomfish/joomfish.mootools.js', true, true);
+
 		//$document->setTitle(JText::_('JOOMFISH_TITLE') . ' :: ' .JText::_( 'LANGUAGE_TITLE' ));
 		$paramsField = JRequest::getVar('paramsField', '');
 		$this->assignRef('paramsField',$paramsField);
@@ -151,13 +150,11 @@ public function translateConfig($tpl = null) {
 	public function filebrowser($tpl = null){
 		$document = JFactory::getDocument();
 		$livesite = JURI::base();
-		JHtml::_('behavior.mootools');
-		JHtml::_('behavior.modal');
 		$document->addStyleSheet($livesite.'components/com_joomfish/assets/css/joomfish.css');
-		$document->addScript($livesite.'components/com_joomfish/assets/js/joomfish.mootools.js');
-		//$document->addStyleSheet(JURI::base().'components/com_media/assets/popup-imagelist.css');
 		$document->addStyleSheet(JURI::root(true).'/media/media/css/popup-imagelist.css');
-
+		JHtml::_('behavior.modal');
+		JHTML::script('com_joomfish/joomfish.mootools.js', true, true);
+
         $jfManager = JoomFishManager::getInstance();
         $root = $jfManager->getCfg('directory_flags');
 

diff --git a/admin/assets/js/joomfish.mootools.js → media/js/joomfish.mootools.js b/admin/assets/js/joomfish.mootools.js → media/js/joomfish.mootools.js