[Skybrud] added nocrop option

skybrud · Jun 5, 2018 · 35c111f · 35c111f
1 parent 497bcf9
commit 35c111f
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 9 deletions.
diff --git a/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Controllers/ImagePickerPreValues.js b/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Controllers/ImagePickerPreValues.js
@@ -40,6 +40,7 @@
     $scope.descriptionMode = $scope.propertyModes[0];
     $scope.linkMode = $scope.propertyModes[0];
 
+
     // Update the values for "titleMode", "descriptionMode" and "linkMode"
     angular.forEach($scope.propertyModes, function (mode) {
         if (cfg.items.title && cfg.items.title.mode == mode.alias) $scope.titleMode = mode;

diff --git a/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Directives/ImagePicker.js b/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Directives/ImagePicker.js
@@ -112,6 +112,10 @@
                 scope.cfg.items.description.hidden = scope.cfg.items.description.mode == 'hidden';
                 scope.cfg.items.link.required = scope.cfg.items.link.mode == 'required';
                 scope.cfg.items.link.hidden = scope.cfg.items.link.mode == 'hidden';
+
+                if (!scope.cfg.items.nocrop) scope.cfg.items.nocrop = {};
+                scope.cfg.items.nocrop.visible = scope.cfg.items.nocrop.mode === 'visible';
+                scope.cfg.items.nocrop.default = scope.cfg.items.nocrop.default === true;
 
                 scope.itemStyles = {
                     width: scope.cfg.image.width + 'px',
@@ -189,7 +193,8 @@
                         title: '',
                         description: '',
                         imageId: 0,
-                        link: null
+                        link: null,
+                        nocrop: scope.cfg.items.nocrop.default
                     };
 
                     // Collapse all open rows
@@ -235,7 +240,8 @@
                                 imageId: image.id,
                                 $image: image,
                                 link: null,
-                                $showInfo: scope.layout == 'list' && model.selectedImages.length == 1
+                                $showInfo: scope.layout == 'list' && model.selectedImages.length == 1,
+                                nocrop: scope.cfg.items.nocrop.default
                             };
 
                             item.$imageUrl = item.imageUrl = getImageUrl(item);

diff --git a/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Lang/da-DK.xml b/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Lang/da-DK.xml
@@ -22,6 +22,7 @@
     <key alias="labelTitle_placeholder">Angiv titel her</key>
     <key alias="labelDescription">Beskrivelse</key>
     <key alias="labelDescriptionPlaceholder">Angiv beskrivelse her</key>
+    <key alias="labelNoCrop">Beskær ikke billede</key>
 
     <key alias="labelLink">Link</key>
     <key alias="labelLinkType">Type</key>

diff --git a/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Lang/en-GB.xml b/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Lang/en-GB.xml
@@ -22,6 +22,7 @@
     <key alias="labelTitlePlaceholder">Specify title here</key>
     <key alias="labelDescription">Description</key>
     <key alias="labelDescriptionPlaceholder">Specify description here</key>
+    <key alias="labelNoCrop">Don´t crop image</key>
 
     <key alias="labelLink">Link</key>
     <key alias="labelLinkType">Type</key>

diff --git a/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Lang/en-US.xml b/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Lang/en-US.xml
@@ -22,6 +22,7 @@
     <key alias="labelTitlePlaceholder">Specify title here</key>
     <key alias="labelDescription">Description</key>
     <key alias="labelDescriptionPlaceholder">Specify description here</key>
+    <key alias="labelNoCrop">Don´t crop image</key>
 
     <key alias="labelLink">Link</key>
     <key alias="labelLinkType">Type</key>

diff --git a/...ybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Views/Partials/ImagePickerDebugger.html b/...ybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Views/Partials/ImagePickerDebugger.html
@@ -62,6 +62,9 @@
             <label>
                 <input type="checkbox" ng-model="config.items.hideLink" /> Hide link
             </label>
+            <label>
+                <input type="checkbox" ng-model="config.items.nocrop.default" /> NoCrop default
+            </label>
         </div>
     </div>
 </div>
diff --git a/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Views/Partials/ImagePickerList.html b/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Views/Partials/ImagePickerList.html
@@ -145,6 +145,12 @@
                                     </div>
                                     <input type="hidden" ng-model="item.$link" ng-required="cfg.items.link.required" id="imagePickerRowLink{{item.$uniqueId}}" />
                                 </div>
+                                <div class="subpart" ng-hide="!config.items.nocrop.visible">
+                                    <div class="title">
+                                        <localize key="imagepicker_labelNoCrop">Don´t crop image</localize>
+                                    </div>
+                                    <input type="checkbox" ng-model="item.nocrop" />
+                                </div>
                             </div>
                         </div>
                     </div>

diff --git a/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Views/Partials/ImagePickerTiles.html b/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Views/Partials/ImagePickerTiles.html
@@ -76,6 +76,12 @@
                 </a>
             </div>
         </div>
+        <div class="subpart" ng-hide="!config.items.nocrop.visible">
+            <div class="title">
+                <localize key="imagepicker_labelNoCrop">No crop</localize>
+            </div>
+            <input type="checkbox" ng-model="item.nocrop" />
+        </div>
         <input type="hidden" ng-model="item.imageUrl" required id="imagePickerRowImage{{item.$uniqueId}}" />
         <input type="hidden" ng-model="item.$link" ng-required="cfg.items.link.required" id="imagePickerRowLink{{item.$uniqueId}}" />
     </div>

diff --git a/src/Skybrud.ImagePicker/ImagePickerItem.cs b/src/Skybrud.ImagePicker/ImagePickerItem.cs
@@ -64,7 +64,12 @@ public class ImagePickerItem {
         [JsonConverter(typeof(LinkPickerItemConverter))]
         public LinkPickerItem Link { get; private set; }
 
-        /// <summary>
+		[JsonProperty("noCrop")]
+	    public bool NoCrop { get; private set; }
+
+
+
+	    /// <summary>
         /// Gets whether a valid link has been specified for this item.
         /// </summary>
         [JsonIgnore]
@@ -104,6 +109,23 @@ public ImagePickerItem(ImagePickerImage image, string title, string description,
             Link = link ?? LinkPickerItem.Parse(new JObject());
         }
 
+	    /// <summary>
+	    /// Initializes a new image picker item based on the specified <paramref name="image"/>, <paramref name="title"/>,
+	    /// <paramref name="description"/> and <paramref name="link"/>.
+	    /// </summary>
+	    /// <param name="image">An instance of <see cref="IPublishedContent"/> representing the selected image.</param>
+	    /// <param name="title">The title of the item.</param>
+	    /// <param name="description">The description of the item.</param>
+	    /// <param name="link">An instance of <see cref="LinkPickerItem"/> representing the link of the item.</param>
+	    /// <param name="noCrop">The NoCrop property value</param>
+	    public ImagePickerItem(ImagePickerImage image, string title, string description, LinkPickerItem link, bool noCrop) {
+		    Image = image;
+		    Title = title;
+		    Description = description;
+		    Link = link ?? LinkPickerItem.Parse(new JObject());
+		    NoCrop = noCrop;
+	    }
+
         /// <summary>
         /// Initializes a new image picker item based on the specified <see cref="JObject"/>.
         /// </summary>
@@ -114,6 +136,7 @@ protected ImagePickerItem(JObject obj) {
             Title = obj.GetString("title") ?? "";
             Description = obj.GetString("description") ?? "";
             Link = obj.GetObject("link", LinkPickerItem.Parse) ?? LinkPickerItem.Parse(new JObject());
+	        NoCrop = obj.GetBoolean("nocrop");
         }
 
         #endregion

diff --git a/src/Skybrud.ImagePicker/Properties/AssemblyInfo.cs b/src/Skybrud.ImagePicker/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyInformationalVersion("1.1.7")]
-[assembly: AssemblyVersion("1.1.7.0")]
-[assembly: AssemblyFileVersion("1.1.7.0")]
+[assembly: AssemblyInformationalVersion("1.1.8")]
+[assembly: AssemblyVersion("1.1.8.0")]
+[assembly: AssemblyFileVersion("1.1.8.0")]
diff --git a/src/Skybrud.ImagePicker/Properties/AssemblyInfo.json b/src/Skybrud.ImagePicker/Properties/AssemblyInfo.json
@@ -4,7 +4,7 @@
   "company": "Skybrud.dk",
   "product": "Skybrud.ImagePicker",
   "copyright": "Copyright © 2018",
-  "version": "1.1.7.0",
-  "informationalVersion": "1.1.7",
-  "fileVersion": "1.1.7.0"
+  "version": "1.1.8.0",
+  "informationalVersion": "1.1.8",
+  "fileVersion": "1.1.8.0"
 }