#5099: Improved image element dialog by hiding Save/Cancel buttons.

src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj

@@ -90,6 +90,7 @@
     <Content Include="Scripts\DemoData.js" />
     <Content Include="Scripts\element-browser.js" />
     <Content Include="Scripts\AutoFocus.js" />
+    <Content Include="Scripts\Elements\Image.js" />
     <Content Include="Scripts\LayoutDesignerHost.js" />
     <Content Include="Scripts\element-editor.js" />
     <Content Include="Scripts\frame.js" />
@@ -322,7 +323,7 @@
     <Compile Include="Drivers\MenuElementDriver.cs" />
     <Compile Include="Drivers\NotificationsElementDriver.cs" />
     <Compile Include="Drivers\HeadingElementDriver.cs" />
-   <Compile Include="Drivers\ShapeElementDriver.cs" />
+    <Compile Include="Drivers\ShapeElementDriver.cs" />
     <Compile Include="Drivers\BreakElementDriver.cs" />
     <Compile Include="Elements\Breadcrumbs.cs" />
     <Compile Include="Elements\Canvas.cs" />

src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Elements/Image.js

@@ -0,0 +1,11 @@
+(function ($) {
+    $(function() {
+        $(".media-library-picker-field").on("opened", function(e) {
+            window.parent.currentDialog.toggleCommands(false);
+        });
+
+        $(".media-library-picker-field").on("closed", function(e) {
+            window.parent.currentDialog.toggleCommands(true);
+        });
+    });
+})(jQuery);

src/Orchard.Web/Modules/Orchard.Layouts/Scripts/dialog.js

@@ -124,6 +124,13 @@
             this.element.trigger(event, args);
         };
 
+        this.toggleCommands = function (show) {
+            var scope = this.element;
+            var buttons = scope.find(".buttons");
+
+            buttons.toggle(show);
+        };
+
         var resizeIFrame = function () {
             if (self.frame == null)
                 return;
@@ -202,7 +209,7 @@
                     var button = $(this);
                     var command = button.data("command");
 
-                    if (!command || command.length == 0)
+                    if (!command || command.length === 0)
                         return;
 
                     self.trigger("command", {

src/Orchard.Web/Modules/Orchard.Layouts/Views/EditorTemplates/Elements.Image.cshtml

@@ -1,5 +1,9 @@
 @using Orchard.ContentManagement
 @model Orchard.Layouts.ViewModels.ImageEditorViewModel
+@{
+    Script.Require("jQuery");
+    Script.Include("Elements/Image.js");
+}
 @{
     var contentItems = new List<ContentItem>();
 

src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library-picker.js

@@ -78,12 +78,15 @@
                 onLoad: function() { // hide the scrollbars from the main window
                     $('html, body').css('overflow', 'hidden');
                     $('#cboxClose').remove();
+                    element.trigger("opened");
                 },
                 onClosed: function() {
                     $('html, body').css('overflow', '');
                     var selectedData = $.colorbox.selectedData;
-                    if (selectedData == null) // Dialog cancelled, do nothing
+                    if (selectedData == null) { // Dialog cancelled, do nothing
+                        element.trigger("closed");
                         return;
+                    }
 
                     var selectionLength = multiple ? selectedData.length : Math.min(selectedData.length, 1);
                     
@@ -102,6 +105,8 @@
                     if (selectedData.length) {
                         showSaveMsg();
                     }
+
+                    element.trigger("closed");
                 }
             });