fix issue #68 regarding importing of page and block views

daylightstudio · Mar 21, 2011 · 38ff11a · 38ff11a
1 parent 0bbca2d
commit 38ff11a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/fuel/modules/fuel/assets/js/fuel/controller/BlockController.js b/fuel/modules/fuel/assets/js/fuel/controller/BlockController.js
@@ -31,6 +31,13 @@ fuel.controller.BlockController = jqx.createController(fuel.controller.BaseFuelC
 					{
 						$(id).val(html);
 						$(id).addClass('change');
+						if (CKEDITOR.instances['view']){
+							CKEDITOR.instances['view'].setData($('#view').val());
+							var scrollTo = '#cke_' + 'view';
+						} else {
+							var scrollTo = id;
+						}
+						$('#main_content').scrollTo($(scrollTo), 800);
 					}
 					$('#warning_window').hide();
 				} else {

diff --git a/fuel/modules/fuel/assets/js/fuel/controller/PageController.js b/fuel/modules/fuel/assets/js/fuel/controller/PageController.js
@@ -79,7 +79,13 @@ fuel.controller.PageController = jqx.createController(fuel.controller.BaseFuelCo
 					{
 						$(id).val(html);
 						$(id).addClass('change');
-						$('#main_content').scrollTo($(id), 800);
+						if (CKEDITOR.instances[_this.initObj.import_view_key]){
+							CKEDITOR.instances[_this.initObj.import_view_key].setData($(id).val());
+							var scrollTo = '#cke_' + _this.initObj.import_view_key;
+						} else {
+							var scrollTo = id;
+						}
+						$('#main_content').scrollTo($(scrollTo), 800);
 					}
 					$('#view_twin_notification').hide();
 				} else {

diff --git a/fuel/modules/fuel/config/fuel_modules.php b/fuel/modules/fuel/config/fuel_modules.php
@@ -23,7 +23,7 @@
 	'default_col' => 'location',
 	'default_order' => 'asc',
 	'js_controller' => 'PageController',
-	'js_controller_params' => array('import_view_key' => 'body'),
+	'js_controller_params' => array('import_view_key' => 'vars--body'),
 	'js_localized' => array('pages_default_location'),
 	'preview_path' => '{location}',
 	'views' => array(