diff --git a/app/assets/javascripts/admin/index_utils/services/status_message.js.coffee b/app/assets/javascripts/admin/index_utils/services/status_message.js.coffee deleted file mode 100644 index 5dd9fb7258..0000000000 --- a/app/assets/javascripts/admin/index_utils/services/status_message.js.coffee +++ /dev/null @@ -1,30 +0,0 @@ -angular.module("admin.indexUtils").factory "StatusMessage", ($timeout) -> - new class StatusMessage - types: - progress: {timeout: false, style: {color: '#ff9906'}} - alert: {timeout: 5000, style: {color: 'grey'}} - notice: {timeout: false, style: {color: 'grey'}} - success: {timeout: 5000, style: {color: '#9fc820'}} - failure: {timeout: false, style: {color: '#da5354'}} - - statusMessage: - text: "" - style: {} - - active: -> - @statusMessage.text != '' - - display: (type, text) -> - @statusMessage.text = text - @statusMessage.style = @types[type].style - $timeout.cancel @statusMessage.timeout if @statusMessage.timeout - timeout = @types[type].timeout - if timeout - @statusMessage.timeout = $timeout => - @clear() - , timeout, true - null # So we don't return weird timeouts - - clear: -> - @statusMessage.text = '' - @statusMessage.style = {} diff --git a/app/assets/javascripts/admin/line_items/line_items.js.coffee b/app/assets/javascripts/admin/line_items/line_items.js.coffee index a3328c572e..8128a50e8a 100644 --- a/app/assets/javascripts/admin/line_items/line_items.js.coffee +++ b/app/assets/javascripts/admin/line_items/line_items.js.coffee @@ -1 +1 @@ -angular.module("admin.lineItems", ["admin.indexUtils", "admin.products", "admin.orders", "admin.enterprises", "admin.orderCycles"]) +angular.module("admin.lineItems", ["admin.indexUtils", "admin.utils", "admin.products", "admin.orders", "admin.enterprises", "admin.orderCycles"]) diff --git a/app/assets/javascripts/admin/index_utils/directives/save_bar.js.coffee b/app/assets/javascripts/admin/utils/directives/save_bar.js.coffee similarity index 68% rename from app/assets/javascripts/admin/index_utils/directives/save_bar.js.coffee rename to app/assets/javascripts/admin/utils/directives/save_bar.js.coffee index 0b30499d1d..13e4f84bc6 100644 --- a/app/assets/javascripts/admin/index_utils/directives/save_bar.js.coffee +++ b/app/assets/javascripts/admin/utils/directives/save_bar.js.coffee @@ -1,4 +1,4 @@ -angular.module("admin.indexUtils").directive "saveBar", (StatusMessage) -> +angular.module("admin.utils").directive "saveBar", (StatusMessage) -> restrict: "E" scope: save: "&" diff --git a/app/assets/javascripts/admin/utils/services/status_message.js.coffee b/app/assets/javascripts/admin/utils/services/status_message.js.coffee index d317269ca4..6aac046a7f 100644 --- a/app/assets/javascripts/admin/utils/services/status_message.js.coffee +++ b/app/assets/javascripts/admin/utils/services/status_message.js.coffee @@ -11,6 +11,9 @@ angular.module("admin.utils").factory "StatusMessage", ($timeout) -> text: "" style: {} + active: -> + @statusMessage.text != '' + display: (type, text) -> @statusMessage.text = text @statusMessage.style = @types[type].style @@ -20,6 +23,7 @@ angular.module("admin.utils").factory "StatusMessage", ($timeout) -> @statusMessage.timeout = $timeout => @clear() , timeout, true + null # So we don't return weird timeouts clear: -> @statusMessage.text = '' diff --git a/app/assets/javascripts/admin/variant_overrides/variant_overrides.js.coffee b/app/assets/javascripts/admin/variant_overrides/variant_overrides.js.coffee index bddef7cf6f..ae46cd14c7 100644 --- a/app/assets/javascripts/admin/variant_overrides/variant_overrides.js.coffee +++ b/app/assets/javascripts/admin/variant_overrides/variant_overrides.js.coffee @@ -1 +1 @@ -angular.module("admin.variantOverrides", ["admin.indexUtils", "pasvaz.bindonce", "admin.dropdown"]) +angular.module("admin.variantOverrides", ["pasvaz.bindonce", "admin.indexUtils", "admin.utils", "admin.dropdown"]) diff --git a/app/assets/javascripts/templates/admin/save_bar.html.haml b/app/assets/javascripts/templates/admin/save_bar.html.haml index 618402cf2b..452e81f6e3 100644 --- a/app/assets/javascripts/templates/admin/save_bar.html.haml +++ b/app/assets/javascripts/templates/admin/save_bar.html.haml @@ -1,6 +1,6 @@ #save-bar.animate-show{ ng: { show: 'form.$dirty || StatusMessage.active()' } } .twelve.columns.alpha - %h5#status-messae{ ng: { style: 'StatusMessage.statusMessage.style' } } + %h5#status-message{ ng: { style: 'StatusMessage.statusMessage.style' } } {{ StatusMessage.statusMessage.text || " " }} .four.columns.omega.text-right %input.red{type: "button", value: "Save Changes", ng: { disabled: '!form.$dirty', click: "save()" } }