diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee index 0a35c8a678..c93b8447e2 100644 --- a/app/assets/javascripts/admin/bulk_product_update.js.coffee +++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee @@ -62,7 +62,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout $scope.resetProducts = -> DirtyProducts.clear() - StatusMessage.clearMessage() + StatusMessage.clear() # $scope.matchProducer = (product) -> # for producer in $scope.producers @@ -180,7 +180,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout if productsToSubmit.length > 0 $scope.updateProducts productsToSubmit # Don't submit an empty list else - StatusMessage.displayMessage 'No changes to save.', 'alert' + StatusMessage.display 'No changes to save.', 'alert' $scope.updateProducts = (productsToSubmit) -> @@ -248,23 +248,23 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout $scope.displayUpdating = -> - StatusMessage.displayMessage 'Saving...', 'progress' + StatusMessage.display 'Saving...', 'progress' $scope.displaySuccess = -> - StatusMessage.displayMessage 'Changes saved.', 'success' + StatusMessage.display 'Changes saved.', 'success' $scope.displayFailure = (failMessage) -> - StatusMessage.displayMessage "Saving failed. #{failMessage}", 'failure' + StatusMessage.display "Saving failed. #{failMessage}", 'failure' $scope.displayDirtyProducts = -> if DirtyProducts.count() > 0 message = if DirtyProducts.count() == 1 then "one product" else DirtyProducts.count() + " products" - StatusMessage.displayMessage "Changes to #{message} remain unsaved.", 'notice' + StatusMessage.display "Changes to #{message} remain unsaved.", 'notice' else - StatusMessage.clearMessage() + StatusMessage.clear() filterSubmitProducts = (productsToFilter) -> diff --git a/app/assets/javascripts/admin/services/status_message.js.coffee b/app/assets/javascripts/admin/services/status_message.js.coffee index a400f0428e..3019b2e7cf 100644 --- a/app/assets/javascripts/admin/services/status_message.js.coffee +++ b/app/assets/javascripts/admin/services/status_message.js.coffee @@ -11,16 +11,16 @@ angular.module("ofn.admin").factory "StatusMessage", ($timeout) -> text: "" style: {} - displayMessage: (text, type) -> + display: (text, type) -> @statusMessage.text = text @statusMessage.style = @types[type].style $timeout.cancel @statusMessage.timeout if @statusMessage.timeout timeout = @types[type].timeout if timeout @statusMessage.timeout = $timeout => - @clearMessage() + @clear() , timeout, true - clearMessage: -> + clear: -> @statusMessage.text = '' @statusMessage.style = {}