Merge pull request #57 from KalikoCMS/1.0.1-dev

Merging dev branch for 1.0.1 to master
KalikoCMS · Sep 11, 2015 · d89d7dd · d89d7dd
2 parents 409718c + 2408246
commit d89d7dd
Show file tree

Hide file tree

Showing 24 changed files with 917 additions and 649 deletions.
diff --git a/KalikoCMS.Admin/Admin/Content/Dialogs/EditImageDialog.aspx b/KalikoCMS.Admin/Admin/Content/Dialogs/EditImageDialog.aspx
@@ -68,10 +68,17 @@
       });
 
       cropImage.load(function () {
-        enableSaveButton();
         image.src = $(this).attr('src');
-        jcropApi.setSelect([0, 0, 9999, 9999]);
-        setTimeout(function () { jcropApi.setSelect([0, 0, 9999, 9999]); }, 200); // Call with slight delay
+
+        if (image.src.substr(0, 5) == "data:") {
+            return;
+        }
+
+        enableSaveButton();
+        if (typeof (jcropApi) != "undefined") {
+            jcropApi.setSelect(<%=CropValues%>);
+        }
+        setTimeout(function () { jcropApi.setSelect(<%=CropValues%>); }, 200); // Call with slight delay
       }).attr("src", localImagePath);
 
       function enableSaveButton() {
@@ -96,7 +103,7 @@
       }
 
       function onImageLoaded() {
-        jcropApi.setSelect([0, 0, 9999, 9999]);
+        jcropApi.setSelect(<%=CropValues%>);
         setTimeout(function () { jcropApi.setSelect([0, 0, 9999, 9999]); }, 200); // Call with slight delay
       }