diff --git a/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Controllers/ImagePickerPreValues.js b/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Controllers/ImagePickerPreValues.js
index 512faf3..958e6db 100644
--- 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
index 991b8df..282c855 100644
--- 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
index 77e1e0f..ebcfb12 100644
--- 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 @@
Angiv titel her
Beskrivelse
Angiv beskrivelse her
+ Beskær ikke billede
Link
Type
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
index 56a4f66..92d96bc 100644
--- 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 @@
Specify title here
Description
Specify description here
+ Don´t crop image
Link
Type
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
index 9c6f37f..38e232b 100644
--- 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 @@
Specify title here
Description
Specify description here
+ Don´t crop image
Link
Type
diff --git a/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Views/Partials/ImagePickerDebugger.html b/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Views/Partials/ImagePickerDebugger.html
index aa3d061..39c2c07 100644
--- a/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Views/Partials/ImagePickerDebugger.html
+++ b/src/Skybrud.ImagePicker/App_Plugins/Skybrud.ImagePicker/Views/Partials/ImagePickerDebugger.html
@@ -62,6 +62,9 @@
+
\ No newline at end of file
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
index fa89029..a581096 100644
--- 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 @@
+
+
+ Don´t crop image
+
+
+
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
index 990df2f..ca2c7de 100644
--- 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 @@
+
diff --git a/src/Skybrud.ImagePicker/ImagePickerItem.cs b/src/Skybrud.ImagePicker/ImagePickerItem.cs
index eb31ac7..76d7a3e 100644
--- 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; }
- ///
+ [JsonProperty("noCrop")]
+ public bool NoCrop { get; private set; }
+
+
+
+ ///
/// Gets whether a valid link has been specified for this item.
///
[JsonIgnore]
@@ -104,6 +109,23 @@ public ImagePickerItem(ImagePickerImage image, string title, string description,
Link = link ?? LinkPickerItem.Parse(new JObject());
}
+ ///
+ /// Initializes a new image picker item based on the specified , ,
+ /// and .
+ ///
+ /// An instance of representing the selected image.
+ /// The title of the item.
+ /// The description of the item.
+ /// An instance of representing the link of the item.
+ /// The NoCrop property value
+ 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;
+ }
+
///
/// Initializes a new image picker item based on the specified .
///
@@ -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
index 55afab2..b0e2e26 100644
--- 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
index 04e52b9..fe8fda4 100644
--- 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"
}
\ No newline at end of file