clockpunch 0.1.4 → 0.1.5

data/CHANGELOG.md

@@ -1,10 +1,16 @@
 # Clockpunch Changelog
 
+## Version 0.1.5 (July 12, 2013)
+
+  * Don't apply timeinput multiple times
+  * Ability to pass 'hm' as a time format
+  * Began refactoring to allow application-defined formats via strings and functions
+
 ## Version 0.1.4 (July 10, 2013)
-  
+
   * Support input type="number"
 
 ## Version 0.1.3 (July 2, 2013)
 
   * Can replace <span> or other elements with the specified format
-  * Allow format as an option 
+  * Allow format as an option

data/README.md

@@ -74,6 +74,23 @@ This library comprises the following pieces:
    - "1:30.2" is read like "1:30"
 - See spec/time_parser_spec.coffee for more examples of how input is handled.
 
+### Formats
+
+There are three built-in formats:
+
+  * default: "H:MM"
+    * Zero-padded minutes
+  * hm: "HmMMm"
+    * Zero-padded minutes
+  * minutes: MMm
+    * Not zero-padded. Always show total minutes. E.g. 90 minutes stays "90m"
+
+To use one of the other formats, just pass it in the constructor, e.g. `new TimeParser('hm')`
+
+#### Custom formats
+
+You can also pass custom formats either as a string or a function. This feature is still in development.
+
 # Use in Forms
 
 Apply the jQuery plugin to the elements:

data/app/assets/javascripts/clockpunch.js

@@ -1,7 +1,7 @@
 // Generated by CoffeeScript 1.4.0
 
 /*
-Clockpunch 0.1.4
+Clockpunch 0.1.5
 https://github.com/tablexi/clockpunch
 */
 
@@ -27,7 +27,7 @@ https://github.com/tablexi/clockpunch
 
     function TimeParsingInput(elem, format) {
       if (format == null) {
-        format = null;
+        format = 'default';
       }
       this.$elem = $(elem);
       this.$elem.data('timeparser', this);
@@ -51,6 +51,9 @@ https://github.com/tablexi/clockpunch
     TimeParsingInput.prototype.configure_input = function(format) {
       var self;
       self = this;
+      if (this.$elem.hasClass('clockpunch-applied')) {
+        return;
+      }
       this.create_hidden_field(format);
       this.ensure_elem_is_text();
       this.$elem.change(function() {
@@ -61,7 +64,8 @@ https://github.com/tablexi/clockpunch
         return $this.val(self.parser.from_minutes(minutes));
       });
       this.$elem.trigger('change');
-      return this.create_tooltip();
+      this.create_tooltip();
+      return this.$elem.addClass('clockpunch-applied');
     };
 
     TimeParsingInput.prototype.create_hidden_field = function() {
@@ -112,8 +116,10 @@ https://github.com/tablexi/clockpunch
   window.TimeParser = (function() {
 
     function TimeParser(time_format) {
-      this.time_format = time_format != null ? time_format : null;
-      this.time_format || (this.time_format = "{HOURS}:{MINUTES}");
+      if (time_format == null) {
+        time_format = null;
+      }
+      this.time_format = this.get_format_mapping(time_format);
     }
 
     /*
@@ -172,11 +178,7 @@ https://github.com/tablexi/clockpunch
       }
       hours = Math.floor(minutes / 60.0);
       mins = minutes % 60;
-      return this.format(hours, mins);
-    };
-
-    TimeParser.prototype.format = function(hours, minutes) {
-      return this.time_format.replace('{HOURS}', hours).replace('{MINUTES}', TimeParser.pad(minutes.toString()));
+      return this.time_format(hours, mins);
     };
 
     TimeParser.prototype.transform = function(string) {
@@ -230,6 +232,36 @@ https://github.com/tablexi/clockpunch
       };
     };
 
+    TimeParser.prototype.get_format_mapping = function(format) {
+      var formats;
+      if (typeof format === 'function') {
+        return format;
+      }
+      formats = {
+        "default": function(hours, minutes) {
+          return this.default_string_format('{HOURS}:{MINUTES}', hours, minutes);
+        },
+        hm: function(hours, minutes) {
+          return this.default_string_format('{HOURS}h{MINUTES}m', hours, minutes);
+        },
+        minutes: function(hours, minutes) {
+          var total_minutes;
+          total_minutes = hours * 60 + minutes;
+          return total_minutes.toString();
+        }
+      };
+      if (format == null) {
+        return formats['default'];
+      }
+      return formats[format] || function(hours, minutes) {
+        return this.default_string_format(format, hours, minutes);
+      };
+    };
+
+    TimeParser.prototype.default_string_format = function(format_string, hours, minutes) {
+      return format_string.replace('{HOURS}', hours).replace('{MINUTES}', TimeParser.pad(minutes.toString()));
+    };
+
     return TimeParser;
 
   })();

data/lib/clockpunch/version.rb

@@ -1,3 +1,3 @@
 module Clockpunch
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clockpunch
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass