raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-04-06 07:29:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moving SaveBar directive and StatusMessage service into admin.utils module

Browse Source
This commit is contained in:
Rob Harrington
2015-12-18 11:29:06 +11:00
parent 521f227f74
commit 4553bc2997
6 changed files with 8 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
app/assets/javascripts/admin/line_items/line_items.js.coffee
View File

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

2
app/assets/javascripts/admin/index_utils/directives/save_bar.js.coffee → app/assets/javascripts/admin/utils/directives/save_bar.js.coffee
View File

@@ -1,4 +1,4 @@
angular.module("admin.indexUtils").directive "saveBar", (StatusMessage) ->
angular.module("admin.utils").directive "saveBar", (StatusMessage) ->
restrict: "E"
scope:
save: "&"

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

@@ -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 = ''

2
app/assets/javascripts/admin/variant_overrides/variant_overrides.js.coffee
View File

@@ -1 +1 @@
angular.module("admin.variantOverrides", ["admin.indexUtils", "pasvaz.bindonce", "admin.dropdown"])
angular.module("admin.variantOverrides", ["pasvaz.bindonce", "admin.indexUtils", "admin.utils", "admin.dropdown"])

2
app/assets/javascripts/templates/admin/save_bar.html.haml
View File

@@ -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()" } }