raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-11 23:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename methods to reduce naming duplication

Browse Source
This commit is contained in:
Rohan Mitchell
2014-12-04 17:09:05 +11:00
parent bcc3815f6b
commit 9c4c0f87e3
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/admin/bulk_product_update.js.coffee
View File

@@ -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) ->

6
app/assets/javascripts/admin/services/status_message.js.coffee
View File

@@ -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 = {}