Progress and cleanup code

2014-08-18 15:41:14 +02:00
parent 34877d4b8b
commit bfa6bb66b0
14 changed files with 48 additions and 68 deletions
@@ -1,28 +1,28 @@
+//= require modernizr
 //= require jquery
 //= require jquery_ujs
 //= require jquery-ui/sortable
-//= require modernizr
 // require foundation FOUNDATION 5 JAVASCRIPT IMPLEMENTATIONS AND EMBER ARE NOT COMPATIBLE, FOUNDATION IS TOO SIMPLISTIC AT THE MOMENT AND DESTROYS DOM EVENTS
 //= require js-routes
+//= require moment
 //= require translations
-//= require qwaiter
+// require qwaiter
 //= require ./qsupplier
 //= require handlebars
 //= require faye
 //= require ./base
-//= require qtip
+// require qtip # was used for table actions in section view, now done by EMBER
 //= require pickdate
 //= require_directory .
 //= require_self
-//= require moment
+
 var Qstorage = localStorage;

 $.extend($translations.en, <%= I18n.t('supplier', locale: :en).to_json %>);
 $.extend($translations.nl, <%= I18n.t('supplier', locale: :nl).to_json %>);

-String.prototype.capitalize = function() {
-    return this.charAt(0).toUpperCase() + this.slice(1);
-}
+String.prototype.capitalize = function() { return this.charAt(0).toUpperCase() + this.slice(1); }
+
 window.time_zones = <%= ActiveSupport::TimeZone.all.map{|tz| {name: tz.name, formatted: "GMT#{tz.formatted_offset} #{tz.name}"}}.to_json.html_safe %>;
 window.countries = <%= IsoCountryCodes.all.map{|cc| {name: cc.name}}.to_json.html_safe %>;

@@ -41,7 +41,12 @@ function redirect_to(mapping, variables){
  window.location = path_mapping[mapping] + '?' + vars.join('&')
 }
 function currency(num) {
-  return Qwaiter.currency(num);
+  // num = 0.0 if isNaN(num) || num == '' || num == null
+  // '&euro;&nbsp;' + parseFloat(num).toFixed(2)
+  if (isNaN(num) || num === '' || num === null) {
+    num = 0.0;
+  }
+  return '&euro;&nbsp;' + parseFloat(num).toFixed(2);
 }

 Handlebars.registerHelper('t', function(tlocation) {