From 5a69e85908d2f1ccf66ddd393a76a2e81da1948e Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Sun, 4 Jan 2015 11:10:38 +0100 Subject: [PATCH] cleanup --- app/assets/javascripts/application.js | 17 ------- .../bootstrap_initialize.js.coffee | 12 ----- app/assets/javascripts/qwaiter.js.coffee | 44 ------------------- app/assets/javascripts/views/.gitkeep | 0 ...plication.js.coffee => manifest.js.coffee} | 0 .../waiter/application.js.coffee.erb | 2 +- 6 files changed, 1 insertion(+), 74 deletions(-) delete mode 100644 app/assets/javascripts/application.js delete mode 100644 app/assets/javascripts/bootstrap_initialize.js.coffee delete mode 100644 app/assets/javascripts/qwaiter.js.coffee delete mode 100644 app/assets/javascripts/views/.gitkeep rename app/assets/javascripts/waiter/app/{application.js.coffee => manifest.js.coffee} (100%) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js deleted file mode 100644 index a2ba027b..00000000 --- a/app/assets/javascripts/application.js +++ /dev/null @@ -1,17 +0,0 @@ -// This is a manifest file that'll be compiled into application.js, which will include all the files -// listed below. -// -// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, -// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. -// -// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// the compiled file. -// -// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD -// GO AFTER THE REQUIRES BELOW. -// -//= require jquery -//= require jquery_ujs -// require jquery-ui -//= require_directory . -//= require_self diff --git a/app/assets/javascripts/bootstrap_initialize.js.coffee b/app/assets/javascripts/bootstrap_initialize.js.coffee deleted file mode 100644 index 8bca8446..00000000 --- a/app/assets/javascripts/bootstrap_initialize.js.coffee +++ /dev/null @@ -1,12 +0,0 @@ -jQuery -> - $("a[rel=popover]").popover() - $(".tooltip").tooltip() - $("a[rel=tooltip]").tooltip() - $('input.currency').each(-> - obj = $(this) - original_width = obj.width() - obj.wrap("
") - currency_sign = $("") - obj.before(currency_sign) - obj.css('width', (original_width - currency_sign.outerWidth())+'px') - ) diff --git a/app/assets/javascripts/qwaiter.js.coffee b/app/assets/javascripts/qwaiter.js.coffee deleted file mode 100644 index 122e5a18..00000000 --- a/app/assets/javascripts/qwaiter.js.coffee +++ /dev/null @@ -1,44 +0,0 @@ -window.Qwaiter= - alert: (msg) -> - $('.modal').modal('hide') - template = @mustache('#alert-template', {title: 'Alert', message: msg, close: 'OK'}) - $(template).modal() - false - confirm: (options) -> - options ||= {} - content = options.content || 'Are you sure?' - title = options.title || 'Confirm' - wrapper = $('') - if typeof(options.ok) == 'function' - callback_wrapper = -> - wrapper.modal('hide') - options.ok() - callback_cancel_wrapper = -> - wrapper.modal('hide') - options.cancel() if options.cancel - header = $('') - .append('') - .append('

'+title+'

').appendTo(wrapper) - body = $('').append('

'+content+'

').appendTo(wrapper) - ok_button = $('Yes') - if typeof(options.ok) == 'function' - ok_button.click(callback_wrapper) - else - ok_button.click -> - eval(options.ok) - wrapper.modal('hide') - footer = $('') - .append($('Close').click(callback_cancel_wrapper)) - .append(ok_button) - .appendTo(wrapper) - wrapper.modal() - currency: (num) -> - num = 0.0 if isNaN(num) || num == '' || num == null - '€ ' + parseFloat(num).toFixed(2) - mustache: (selector, locals)-> - locs = $.extend(locals, - currency: -> - (val)-> - currency(Mustache.render(val, this)) - ) - Mustache.to_html($(selector).html(), locs) diff --git a/app/assets/javascripts/views/.gitkeep b/app/assets/javascripts/views/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/app/assets/javascripts/waiter/app/application.js.coffee b/app/assets/javascripts/waiter/app/manifest.js.coffee similarity index 100% rename from app/assets/javascripts/waiter/app/application.js.coffee rename to app/assets/javascripts/waiter/app/manifest.js.coffee diff --git a/app/assets/javascripts/waiter/application.js.coffee.erb b/app/assets/javascripts/waiter/application.js.coffee.erb index 8d9f9314..3760eff1 100644 --- a/app/assets/javascripts/waiter/application.js.coffee.erb +++ b/app/assets/javascripts/waiter/application.js.coffee.erb @@ -1,6 +1,6 @@ #= require jquery #= require jquery_ujs -#= require ./app/application +#= require ./app/manifest #= require foundation #= require moment #= require jquery-ui/datepicker