diff --git a/app/common/directives/file-upload.directive.js b/app/common/directives/file-upload.directive.js index 052bfe3ca2..881bcbc342 100644 --- a/app/common/directives/file-upload.directive.js +++ b/app/common/directives/file-upload.directive.js @@ -7,29 +7,42 @@ function FileUpload() { replace: true, scope: { container: '=', - model: '=' + model: '=', + validation: '=' }, controller: [ - '$scope', '$attrs', + '$scope', '$attrs', 'Notify', function ( - $scope, $attrs + $scope, $attrs, Notify ) { $scope.required = typeof $attrs.required !== 'undefined'; $scope.uploadFile = function ($event) { - $scope.container.file = $event.target.files[0]; - var reader = new FileReader(); - reader.onload = function () { - var dataURL = reader.result; - $scope.container.dataURI = dataURL; - $scope.container.changed = true; - $scope.container.deleted = false; - $scope.model = 'changed'; - $scope.$apply(); - }; - reader.readAsDataURL($event.target.files[0]); - - + if (validateFile($event.target.files[0])) { + $scope.container.file = $event.target.files[0]; + var reader = new FileReader(); + reader.onload = function () { + var dataURL = reader.result; + $scope.container.dataURI = dataURL; + $scope.container.changed = true; + $scope.container.deleted = false; + $scope.model = 'changed'; + $scope.$apply(); + }; + reader.readAsDataURL($event.target.files[0]); + } else { + Notify.error('post.media.error_in_upload'); + } }; + + function validateFile(container) { + if ($scope.validation === 'image') { + var mimeReg = /[\/.](gif|jpg|jpeg|png)$/i; + var mimeCheck = mimeReg.test(container.type); + var sizeCheck = container.size < 1048576; + return mimeCheck && sizeCheck; + } + return true; + } }] }; } diff --git a/app/common/directives/mode-bar/support-links.html b/app/common/directives/mode-bar/support-links.html index a2d14f7358..0d922673c9 100644 --- a/app/common/directives/mode-bar/support-links.html +++ b/app/common/directives/mode-bar/support-links.html @@ -10,8 +10,8 @@

app.report_a_bug.description
app.features.title
app.features.description
-
app.intercom.intercom
-
app.intercom.description
+
app.intercom.intercom
+
app.intercom.description
diff --git a/app/common/locales/en.json b/app/common/locales/en.json index 6f09412d9b..201bdb09d3 100644 --- a/app/common/locales/en.json +++ b/app/common/locales/en.json @@ -840,7 +840,8 @@ "upload" : "Upload", "add_photo": "Add photo", "delete_photo": "Delete photo", - "replace_image": "Replace image" + "replace_image": "Replace image", + "error_in_upload": "Your image is too large (maximum size is 1MB) or has the wrong format (allowed formats are gif, png, jpg and jpeg), please check and try again!" }, "video" : { "enter_a" : "Enter a", diff --git a/app/main/posts/common/post-metadata.html b/app/main/posts/common/post-metadata.html index 13954847af..2650a26258 100644 --- a/app/main/posts/common/post-metadata.html +++ b/app/main/posts/common/post-metadata.html @@ -26,7 +26,7 @@
  • {{timeago}} - {{ displayTime }} + {{ displayTimeFull }}
  • diff --git a/app/main/posts/modify/media-edit.service.js b/app/main/posts/modify/media-edit.service.js index 75eb4dbc7e..df59ea2553 100644 --- a/app/main/posts/modify/media-edit.service.js +++ b/app/main/posts/modify/media-edit.service.js @@ -19,16 +19,19 @@ function ( saveMedia: function (medias, post) { var deferred = $q.defer(); var calls = []; + // Loop over medias and check for changes _.each(medias, function (media, key) { // Check if media needs to be updated if (media.changed) { - // Check if new media or if the media file has changed - // otherwise just update the caption - if (!media.id && media.deleted) { + // Checking if media is marked for deletion + if (media.deleted) { + MediaEditService.deleteMedia(media.id); post.values[key][0] = null; + // Check if new media or if the media file has changed + // otherwise just update the caption // Check if a new file was uploaded - }else if (media.file) { + } else if (media.file) { calls.push(MediaEditService.uploadFile(media).then(function (media) { post.values[key][0] = media ? media.id : null; })); diff --git a/app/main/posts/modify/media.html b/app/main/posts/modify/media.html index 7fa1f5855b..d69fc18604 100644 --- a/app/main/posts/modify/media.html +++ b/app/main/posts/modify/media.html @@ -1,7 +1,7 @@
    - +