ember2 progress deprication smashing
This commit is contained in:
@@ -3,10 +3,11 @@
|
||||
#= require handlebars
|
||||
#= require ember
|
||||
#= require ember-data
|
||||
#= require ember-validations
|
||||
#= require ember-validations
|
||||
#= require ember-template-compiler
|
||||
#= require_directory ./modifications
|
||||
#= require shared-ember-helpers/all
|
||||
#= require ./app
|
||||
#= require shared-ember-helpers/all
|
||||
#= require_directory ./mixins
|
||||
#= require_directory ./services
|
||||
#= require ./controllers/modals/base_controller
|
||||
@@ -14,5 +15,5 @@
|
||||
#= require_tree .
|
||||
|
||||
@$assets_path = '/assets/'
|
||||
@EmberENV = {FEATURES: {'query-params-new': true}}
|
||||
#@EmberENV = {FEATURES: {'query-params-new': true}}
|
||||
@$days = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday']
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
App.ButtonCloseListComponent = Ember.Component.extend
|
||||
templateName: 'close_list_button'
|
||||
layoutName: 'close_list_button'
|
||||
classNames: ['close-list-button']
|
||||
classNameBindings: ['content.active:show:hide']
|
||||
tagName: 'button'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
App.ButtonMarkListHelpedComponent = Ember.View.extend
|
||||
templateName: 'components/button/mark-list-helped'
|
||||
layoutName: 'components/button/mark-list-helped'
|
||||
classNames: ['mark-list-as-helped-button']
|
||||
classNameBindings: ['content.needs_help:show:hide']
|
||||
tagName: 'button'
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
App.ButtonMarkOrderActiveComponent = Ember.Component.extend
|
||||
tagName: 'button'
|
||||
templateName: 'components/button/mark-order-active'
|
||||
layoutName: 'components/button/mark-order-active'
|
||||
classNames: ['mark-order-active-button']
|
||||
classNameBindings: ['order.placed:active:hide']
|
||||
click: -> @get('order').mark_active()
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
App.ButtonMarkOrderCancelledComponent = Ember.Component.extend
|
||||
tagName: 'button'
|
||||
templateName: 'components/button/mark-order-cancelled'
|
||||
layoutName: 'components/button/mark-order-cancelled'
|
||||
classNames: ['mark-order-cancelled-button']
|
||||
classNameBindings: ['showButton:active:hide']
|
||||
showButton: Ember.computed 'order.state', ->
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
App.ButtonMarkOrderDeliveredComponent = Ember.Component.extend
|
||||
tagName: 'button'
|
||||
templateName: 'components/button/mark-order-delivered'
|
||||
layoutName: 'components/button/mark-order-delivered'
|
||||
classNames: ['mark-order-delivered-button']
|
||||
classNameBindings: ['showButton:active:hide']
|
||||
showButton: Ember.computed 'order.state', ->
|
||||
|
||||
@@ -2,7 +2,7 @@ App.BooleanButtonComponent = Ember.Component.extend
|
||||
tagName: 'a'
|
||||
href: '#'
|
||||
classNames: "button"
|
||||
templateName: "form/boolean-button"
|
||||
layoutName: "form/boolean-button"
|
||||
#template: Ember.Handlebars.compile "<span>{{view.text}}</span>"
|
||||
classNameBindings: ['rounded:round', 'active:active:disabled']
|
||||
|
||||
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
App.SelectMinuteOfDayComponent = Ember.Component.extend
|
||||
layoutName: "form/select_minute_of_day"
|
||||
classNameBindings: ['rounded:round']
|
||||
hours_list: [0..24].map (n) -> "0#{n}".substr(-2,2)
|
||||
minutes_list: [0..60].map (n) -> "0#{n}".substr(-2,2)
|
||||
hour: Ember.computed 'value',
|
||||
set: (key, value)->
|
||||
minute = if @get('minute') then parseInt(@get('minute')) else 0
|
||||
@set 'value', 60*parseInt(value) + minute
|
||||
value
|
||||
get: ->
|
||||
number = Math.floor (@get('value') || 0)/60
|
||||
"0#{number}".substr(-2,2)
|
||||
minute: Ember.computed 'value',
|
||||
set: (key, value)->
|
||||
hour = if @get('hour') then parseInt(@get('hour')) else 0
|
||||
@set 'value', 60*hour + parseInt(value)
|
||||
value
|
||||
get: ->
|
||||
number = Math.floor @get('value')%60
|
||||
"0#{number}".substr(-2,2)
|
||||
@@ -1,5 +1,5 @@
|
||||
App.SectionElementComponent = Ember.Component.extend DragNDrop.Draggable,
|
||||
templateName: 'section/element'
|
||||
layoutName: 'section/element'
|
||||
classNames: ['section-element-container']
|
||||
attributeBindings: ['style']
|
||||
show_handles: false
|
||||
|
||||
-7
@@ -25,10 +25,3 @@ App.modals.SectionAddTablesController = App.modals.BaseController.extend
|
||||
@store.createRecord 'table', number: number, section: @get('model')
|
||||
|
||||
@send 'close'
|
||||
#Ember.$.post Routes.add_tables_suppliers_section_path(@get('model.id')),
|
||||
#number_start: s
|
||||
#number_end: e
|
||||
#, (result,state,xhr)=>
|
||||
## @store.pushPayload 'table', result
|
||||
#@store.pushPayload result
|
||||
#@send 'close'
|
||||
|
||||
-8
@@ -20,14 +20,6 @@ App.modals.SectionArrangeTablesController = App.modals.BaseController.extend
|
||||
actions:
|
||||
arrangeTables: ->
|
||||
return unless @isValid()
|
||||
#Ember.$.post Routes.arrange_tables_suppliers_section_path(@get('model.id')),
|
||||
#option: @get('arrange_type')
|
||||
#row_count: @get('row_count')
|
||||
#column_count: @get('column_count')
|
||||
#, (result,state,xhr)=>
|
||||
#@store.pushPayload result
|
||||
#@send 'close'
|
||||
#return
|
||||
switch @get('arrange_type')
|
||||
when 'by_row'
|
||||
@get('model').invoke 'arrange_tables_in_rows_of', parseInt(@get('row_count'))
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
Ember.Handlebars.registerHelper 'can', (permission, resource, options)->
|
||||
if options.types[1] is "ID" and options.data.view
|
||||
resource = options.data.view.get(resource)
|
||||
if employee = App.__container__.lookup('global:variables').get('current_employee')
|
||||
if permission is "read" or (permission is "manage" and employee.isManager())
|
||||
options.fn @
|
||||
App.CanHelper = Ember.Helper.extend
|
||||
compute: (params, options)->
|
||||
[permission, resource] = params
|
||||
if employee = App.__container__.lookup('global:variables').get('current_employee')
|
||||
permission is "read" or (permission is "manage" and employee.isManager())
|
||||
else
|
||||
options.inverse @ if options.inverse
|
||||
else
|
||||
options.inverse @ if options.inverse
|
||||
false
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
Ember.Handlebars.helper 'colorbox', (color, options)->
|
||||
App.ColorboxHelper = Ember.Helper.helper (params, options)->
|
||||
color = params[0]
|
||||
"<span class='colorbox-container'><span style='background-color:#{color}'></span></span>".htmlSafe()
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
Ember.Handlebars.helper 'dimension', (value, options)->
|
||||
App.DimensionHelper = Ember.Helper.helper (params, options)->
|
||||
value = params[0]
|
||||
"#{value}<span class='dimension'>m</span>".htmlSafe()
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
Ember.Handlebars.helper 'errors', (errors, params..., options)->
|
||||
App.ErrorsHelper = Ember.Helper.helper (params, options)->
|
||||
errors = params[0]
|
||||
return "" unless errors and errors.length
|
||||
result = ""
|
||||
model_name = options.hash.includeAttribute
|
||||
model_name = options.includeAttribute
|
||||
for error in errors
|
||||
if typeof error is "string"
|
||||
message = error
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
Ember.Handlebars.helper 'flag', (locale, options)->
|
||||
App.FlagHelper = Ember.Helper.helper (params, options)->
|
||||
locale = params[0]
|
||||
"<img src=\"#{$assets_path}supplier/flags/flag-#{locale}.png\">".htmlSafe()
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
Ember.Handlebars.helper 'gravatar-image', (email, options={})->
|
||||
size = options.hash.size || 48
|
||||
App.GravatarImageHelper = Ember.Helper.helper (params, options)->
|
||||
email = params[0]
|
||||
size = options.size || 48
|
||||
gravatar_hash = md5(String(email).trim().toLowerCase())
|
||||
"<img src='http://www.gravatar.com/avatar/#{gravatar_hash}?s=#{size}' />".htmlSafe()
|
||||
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
Ember.Handlebars.helper 'isCurrentLocale', (locale, options)->
|
||||
if locale is 'nl'
|
||||
options.fn @
|
||||
else
|
||||
options.inverse @
|
||||
@@ -1,3 +1,4 @@
|
||||
## Used to be able to use DS.attr('moment')
|
||||
App.MomentTransform = DS.Transform.extend
|
||||
deserialize: (serialized)->
|
||||
return serialized unless serialized
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
Ember.Handlebars.registerHelper 'page-body-helper', (resource, params..., options)->
|
||||
body = @get resource
|
||||
template = Ember.Handlebars.compile('body')
|
||||
body.htmlSafe()
|
||||
#Ember.Handlebars.registerHelper 'page-body-helper', (resource, params..., options)->
|
||||
# body = @get resource
|
||||
# template = Ember.Handlebars.compile('body')
|
||||
# body.htmlSafe()
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Ember.Handlebars.registerHelper 'route', (route_name, params..., options)->
|
||||
opts = options.hash
|
||||
if scope = @get('content')
|
||||
params = params.map (a) -> scope.get(a)
|
||||
for k,v of opts
|
||||
opts[k] = scope.get(v) if typeof(v) == 'string' && scope.get(v)
|
||||
route = if params.length then Routes[route_name].call(this, params, opts) else Routes[route_name].call(this, opts)
|
||||
new Handlebars.SafeString route
|
||||
#Ember.Handlebars.registerHelper 'route', (route_name, params..., options)->
|
||||
# opts = options.hash
|
||||
# if scope = @get('content')
|
||||
# params = params.map (a) -> scope.get(a)
|
||||
# for k,v of opts
|
||||
# opts[k] = scope.get(v) if typeof(v) == 'string' && scope.get(v)
|
||||
# route = if params.length then Routes[route_name].call(this, params, opts) else Routes[route_name].call(this, opts)
|
||||
# new Handlebars.SafeString route
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
Ember.Handlebars.registerHelper 'path', (route, params..., options)->
|
||||
route_method = Routes["#{route}_path"]
|
||||
throw "Route #{route} cannout be found" unless route_method
|
||||
|
||||
mapped_options = {}
|
||||
|
||||
for k, v of options.hash
|
||||
mapped_options[k] = Ember.Handlebars.get(this, v, options) || v
|
||||
params.push mapped_options
|
||||
|
||||
path = route_method.apply(this, params)
|
||||
new Handlebars.SafeString("href='#{path}'")
|
||||
#Ember.Handlebars.registerHelper 'path', (route, params..., options)->
|
||||
# route_method = Routes["#{route}_path"]
|
||||
# throw "Route #{route} cannout be found" unless route_method
|
||||
#
|
||||
# mapped_options = {}
|
||||
#
|
||||
# for k, v of options.hash
|
||||
# mapped_options[k] = Ember.Handlebars.get(this, v, options) || v
|
||||
# params.push mapped_options
|
||||
#
|
||||
# path = route_method.apply(this, params)
|
||||
# new Handlebars.SafeString("href='#{path}'")
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Ember.Handlebars.helper 'select-hour', (params..., options)->
|
||||
result = "<select class=\"select-hour\">"
|
||||
result += "<option>#{hour}</option>" for hour in [0..24]
|
||||
result += "</select>"
|
||||
new Handlebars.SafeString result
|
||||
#Ember.Handlebars.helper 'select-hour', (params..., options)->
|
||||
# result = "<select class=\"select-hour\">"
|
||||
# result += "<option>#{hour}</option>" for hour in [0..24]
|
||||
# result += "</select>"
|
||||
# new Handlebars.SafeString result
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Ember.Handlebars.helper 'select-minute', (params..., options)->
|
||||
result = "<select class=\"select-minute\">"
|
||||
result += "<option>#{minute}</option>" for minute in [0..24]
|
||||
result += "</select>"
|
||||
new Handlebars.SafeString result
|
||||
#Ember.Handlebars.helper 'select-minute', (params..., options)->
|
||||
# result = "<select class=\"select-minute\">"
|
||||
# result += "<option>#{minute}</option>" for minute in [0..24]
|
||||
# result += "</select>"
|
||||
# new Handlebars.SafeString result
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
Ember.Handlebars.helper 'svg', (content, options)->
|
||||
width = options.hash.width
|
||||
height = options.hash.height
|
||||
angle = options.hash.rotation || 0
|
||||
App.SvgHelper = Ember.Helper.helper (params, options)->
|
||||
content = params[0]
|
||||
width = options.width
|
||||
height = options.height
|
||||
angle = options.rotation || 0
|
||||
box_size = Math.sqrt((width * width) + (height * height))
|
||||
svg_head = "<svg width=\"100%\" height=\"100%\" viewBox=\"0 0 #{box_size} #{box_size}\">"
|
||||
group_head = "<g transform=\"translate(#{(box_size - width)/2}, #{(box_size - height)/2}) rotate(#{angle} #{width/2} #{height/2})\">"
|
||||
|
||||
@@ -13,7 +13,7 @@ else
|
||||
br
|
||||
= boolean-button value=preview_full_day reverse=true text_path="product_category.time_preview.active_at"
|
||||
unless preview_full_day
|
||||
= view "select-minute-of-day" value=preview_minute_of_day
|
||||
= select-minute-of-day value=preview_minute_of_day
|
||||
hr
|
||||
if active
|
||||
a.deactivate-time-preview-button{action "deactivateTimePreview"}= t 'product_category.time_preview.deactivate_button'
|
||||
|
||||
@@ -21,9 +21,9 @@
|
||||
td.boolean= boolean employee.active
|
||||
td.colorbox= colorbox employee.color
|
||||
td.actions
|
||||
can "manage" "sections"
|
||||
if (can "manage" "sections")
|
||||
a.table-edit{ action 'editEmployee' employee }: span
|
||||
a.table-destroy{ action 'destroyEmployee' employee }: span
|
||||
.form-actions
|
||||
can "manage" "employees"
|
||||
if (can "manage" "employees")
|
||||
a.form-action-new.new-employee-button{action "newEmployee"}= t 'employee.new_button'
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
= link-to 'lists'
|
||||
span.icon.lists
|
||||
= t 'models.plural.list'
|
||||
can "manage" "employees"
|
||||
if (can "manage" "employees")
|
||||
li
|
||||
= link-to 'employees'
|
||||
span.icon.employees
|
||||
@@ -30,7 +30,7 @@
|
||||
= link-to 'schedule'
|
||||
span.icon.schedule
|
||||
= t 'top_menu.schedule'
|
||||
can "manage" globals.current_supplier
|
||||
if (can "manage" globals.current_supplier)
|
||||
li
|
||||
=link-to 'settings' class="supplier-settings-link"
|
||||
span.icon.settings
|
||||
|
||||
@@ -4,7 +4,7 @@ header.top-menu
|
||||
.menu-content
|
||||
section.main-buttons
|
||||
= link-to 'index' class="top-menu-root"
|
||||
= image_tag "icons/logo-small.png"
|
||||
= image-tag "icons/logo-small.png"
|
||||
= link-to "menu" class="top-menu-menu"
|
||||
span.icon.menu
|
||||
= t 'top_menu.menu'
|
||||
@@ -17,7 +17,7 @@ header.top-menu
|
||||
= link-to "lists" class="top-menu-lists"
|
||||
span.icon.lists
|
||||
= t 'models.plural.list'
|
||||
can "manage" "employees"
|
||||
if (can "manage" "employees")
|
||||
= link-to "employees" class="top-menu-employees"
|
||||
span.icon.employees
|
||||
= t 'models.plural.employee'
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
.row: .small-12.columns
|
||||
= sections-header section=globals.active_section
|
||||
can "manage" globals.current_supplier
|
||||
if (can "manage" globals.current_supplier)
|
||||
unless globals.current_supplier.open
|
||||
.alert-box.alert.radius data-alert=true
|
||||
= t 'supplier.you_are_currently_closed_alert'
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
each sorted_product_categories as |product_category|
|
||||
.row.product_category-container: .small-12.columns
|
||||
.product_category-header
|
||||
can "manage" "menu"
|
||||
if (can "manage" "menu")
|
||||
a.move{action "moveProductCategory" product_category} href="#"
|
||||
span.title= product_category.name
|
||||
span.availability= product_category.availability_text
|
||||
can "manage" "menu"
|
||||
if (can "manage" "menu")
|
||||
a.edit-product-category-button{action "editProductCategory" product_category} href="#": span
|
||||
a.add-product-product_category-button{action "addProduct" product_category} href="#": span
|
||||
each product_category.sorted_products as |product|
|
||||
= menu-product product=product code_filter=product_code_filter
|
||||
can "manage" "menu"
|
||||
if (can "manage" "menu")
|
||||
.row
|
||||
.small-12.columns
|
||||
a.new-product_category-button{action "newProductCategory"} href="#" = t 'product_category.new_button'
|
||||
|
||||
@@ -34,8 +34,8 @@
|
||||
.small-12.columns.text-center= boolean-button value=model.full_day reverse=true text_path="product_category.modal.active_between.top"
|
||||
unless model.full_day
|
||||
.row
|
||||
.small-12.columns= view "select-minute-of-day" value=model.start_from
|
||||
.small-12.columns= select-minute-of-day value=model.start_from
|
||||
.row
|
||||
.small-12.columns.text-center= t 'product_category.modal.active_between.middle'
|
||||
.row
|
||||
.small-12.columns= view "select-minute-of-day" value=model.end_on
|
||||
.small-12.columns= select-minute-of-day value=model.end_on
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
= link-to 'sections' class="goto-sections-index-tab-header": span
|
||||
each sections as |section|
|
||||
= section-tab-header section=section
|
||||
can "manage" "sections"
|
||||
if (can "manage" "sections")
|
||||
a.add-section{action "addSection"}: span
|
||||
.section-manage-tables.pull-right
|
||||
unless model.editmode
|
||||
a.go-to-orders-list{ action "showDashboardOrders" model }: span
|
||||
can "manage" "sections"
|
||||
if (can "manage" "sections")
|
||||
if model.editmode
|
||||
a.section-rollback-button{ action "rollbackEditable" }: span
|
||||
= input type="text" value=model.title class="section-edit-title-field"
|
||||
|
||||
@@ -36,6 +36,6 @@
|
||||
else
|
||||
.row: .small-12.columns
|
||||
.panel=t 'section.none_found'
|
||||
can "manage" "sections"
|
||||
if (can "manage" "sections")
|
||||
.form-actions
|
||||
a.form-action-new{action "addSection"}=t 'helpers.links.new'
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
/input.location_picker name="location" type="text" valueBinding="location"
|
||||
/.form-row
|
||||
.location_picker_map
|
||||
= image_tag 'supplier/settings/location-balloon.png'
|
||||
= image-tag 'supplier/settings/location-balloon.png'
|
||||
/.form-row
|
||||
.form-label: label=t 'attributes.supplier.time_zone'
|
||||
.form-field: Ember.Select content=time_zones optionValuePath="content.name" optionLabelPath="content.formatted" valueBinding="supplier.time_zone"
|
||||
@@ -34,7 +34,7 @@ if editIensProfile
|
||||
.form-label: label=t 'attributes.supplier.iens_profile'
|
||||
.form-field
|
||||
= number-field numericValue=supplier.iens_profile
|
||||
= image_tag 'supplier/settings/iens-example.png'
|
||||
= image-tag 'supplier/settings/iens-example.png'
|
||||
span=t "settings.reviews.explanation"
|
||||
.row: .small-12.columns= language-switcher
|
||||
.form-row.form-actions
|
||||
|
||||
@@ -18,10 +18,10 @@
|
||||
= table.section.title
|
||||
/td.timestamp=time table.created_at
|
||||
td.actions
|
||||
can "manage" "tables"
|
||||
if (can "manage" "tables")
|
||||
a.table-edit{ action 'editTable' table }: span
|
||||
a.table-destroy{ action 'destroyTable' table }: span
|
||||
.form-actions
|
||||
can "manage" "tables"
|
||||
if (can "manage" "tables")
|
||||
a.form-action-new.new-table-button{action "newTable"}= t 'table.new_button'
|
||||
= qr-codes-link
|
||||
|
||||
-17
@@ -1,17 +0,0 @@
|
||||
App.SelectMinuteOfDayView = Ember.View.extend
|
||||
templateName: "form_elements/select_minute_of_day"
|
||||
classNameBindings: ['rounded:round']
|
||||
hours_list: [0..24].map (n) -> "0#{n}".substr(-2,2)
|
||||
minutes_list: [0..60].map (n) -> "0#{n}".substr(-2,2)
|
||||
hour: Ember.computed 'value', (attribute, setValue)->
|
||||
if arguments.length > 1
|
||||
minute = if @get('minute') then parseInt(@get('minute')) else 0
|
||||
@set 'value', 60*parseInt(setValue) + minute
|
||||
number = Math.floor (@get('value') || 0)/60
|
||||
"0#{number}".substr(-2,2)
|
||||
minute: Ember.computed 'value', (attribute, setValue)->
|
||||
if arguments.length > 1
|
||||
hour = if @get('hour') then parseInt(@get('hour')) else 0
|
||||
@set 'value', 60*hour + parseInt(setValue)
|
||||
number = Math.floor @get('value')%60
|
||||
"0#{number}".substr(-2,2)
|
||||
Reference in New Issue
Block a user