From a8e1265a5809b217d3aa7b0de1a439daf12fcd51 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 4 Dec 2014 17:14:28 +1100
Subject: [PATCH] Swap parameter ordering - follows convention
 Rails.logger.error 'foo'

---
 .../javascripts/admin/bulk_product_update.js.coffee    | 10 +++++-----
 .../admin/services/status_message.js.coffee            |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index c93b8447e2..a2bbc3bb03 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -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.display 'No changes to save.', 'alert'
+        StatusMessage.display 'alert', 'No changes to save.'
 
 
     $scope.updateProducts = (productsToSubmit) ->
@@ -248,21 +248,21 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
 
 
     $scope.displayUpdating = ->
-      StatusMessage.display 'Saving...', 'progress'
+      StatusMessage.display 'progress', 'Saving...'
 
 
     $scope.displaySuccess = ->
-      StatusMessage.display 'Changes saved.', 'success'
+      StatusMessage.display 'success', 'Changes saved.'
 
 
     $scope.displayFailure = (failMessage) ->
-      StatusMessage.display "Saving failed. #{failMessage}", 'failure'
+      StatusMessage.display 'failure', "Saving failed. #{failMessage}"
 
 
     $scope.displayDirtyProducts = ->
       if DirtyProducts.count() > 0
         message = if DirtyProducts.count() == 1 then "one product" else DirtyProducts.count() + " products"
-        StatusMessage.display "Changes to #{message} remain unsaved.", 'notice'
+        StatusMessage.display 'notice', "Changes to #{message} remain unsaved."
       else
         StatusMessage.clear()
 
diff --git a/app/assets/javascripts/admin/services/status_message.js.coffee b/app/assets/javascripts/admin/services/status_message.js.coffee
index 3019b2e7cf..914dabb390 100644
--- a/app/assets/javascripts/admin/services/status_message.js.coffee
+++ b/app/assets/javascripts/admin/services/status_message.js.coffee
@@ -11,7 +11,7 @@ angular.module("ofn.admin").factory "StatusMessage", ($timeout) ->
       text: ""
       style: {}
 
-    display: (text, type) ->
+    display: (type, text) ->
       @statusMessage.text = text
       @statusMessage.style = @types[type].style
       $timeout.cancel @statusMessage.timeout  if @statusMessage.timeout