diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 721e3c1f..8567209c 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -59,6 +59,7 @@ abstract class LeftAndMain extends Controller { Requirements::javascript('jsparty/layout_helpers.js'); Requirements::javascript(MCE_ROOT . 'tiny_mce_src.js'); + Requirements::javascript('cms/javascript/ImageEditor/Activator.js'); Requirements::javascript('jsparty/tiny_mce_improvements.js'); Requirements::javascript('jsparty/scriptaculous/effects.js'); diff --git a/code/ThumbnailStripField.php b/code/ThumbnailStripField.php index e42fb863..d8401e5b 100755 --- a/code/ThumbnailStripField.php +++ b/code/ThumbnailStripField.php @@ -70,8 +70,8 @@ class ThumbnailStripField extends FormField { $result .= '
  • ' . - '' . - '' . $image->Title . '' . + '' . + '' . $image->Title . '' . '' . '
  • '; } @@ -130,4 +130,4 @@ HTML; } } -?> \ No newline at end of file +?> diff --git a/javascript/AssetAdmin.js b/javascript/AssetAdmin.js index 8012db42..289ec592 100755 --- a/javascript/AssetAdmin.js +++ b/javascript/AssetAdmin.js @@ -485,4 +485,10 @@ Behaviour.register({ new Ajax.Request('admin/assets/deleteUnusedThumbnails',options); } } -}); \ No newline at end of file +}); + +function refreshAsset() { + frames[0].location.reload(0); + frames[1].location.reload(1); +} + diff --git a/javascript/ImageEditor/ImageEditor.js b/javascript/ImageEditor/ImageEditor.js index 1e87678a..ca5cb322 100644 --- a/javascript/ImageEditor/ImageEditor.js +++ b/javascript/ImageEditor/ImageEditor.js @@ -30,8 +30,7 @@ ImageEditor.Main = { }, onCloseClick: function() { - window.parent.frames[0].location.reload(1); - window.parent.frames[1].location.reload(1); + window.parent.imageEditorClosed(); ImageEditor.imageTransformation.close(ImageEditor.Main.onCloseCallback.bind(this)); }, diff --git a/javascript/ThumbnailStripField.js b/javascript/ThumbnailStripField.js index 41b46a27..401c6536 100755 --- a/javascript/ThumbnailStripField.js +++ b/javascript/ThumbnailStripField.js @@ -54,4 +54,4 @@ ThumbnailStripField.prototype = { return f; } -} \ No newline at end of file +}