New release v0.2.1.

lukemorton · Feb 8, 2012 · 2bbae8e · 2bbae8e
1 parent deed194
commit 2bbae8e
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 15 deletions.
diff --git a/dist/uniform-0.2.0.min.js b/dist/uniform-0.2.0.min.js
diff --git a/dist/uniform-0.2.0.js → dist/uniform-0.2.1.js b/dist/uniform-0.2.0.js → dist/uniform-0.2.1.js
@@ -1,4 +1,4 @@
-// Uniform v0.2.0
+// Uniform v0.2.1
 // Written by Luke Morton, MIT licensed.
 // https://github.com/DrPheltRight/uniform
 !function (definition) {
@@ -38,13 +38,18 @@ Uniform = (function() {
     var key, val;
     for (key in settings) {
       val = settings[key];
-      this[key] = val;
+      if (key !== 'events') this[key] = val;
     }
     this.uid || (this.uid = ++Uniform.uniqueCounter);
     this.$ || (this.$ = require('jquery'));
     if (!(this.el && (this.el.length != null))) this.el = this.buildTemplate();
     this.cacheElements();
-    this.delegateEvents();
+    if ((settings != null ? settings.events : void 0) != null) {
+      this.delegateEvents(settings.events);
+      delete settings.events;
+    } else {
+      this.delegateEvents();
+    }
     this.init();
   }
 

diff --git a/dist/uniform-0.2.1.min.js b/dist/uniform-0.2.1.min.js
diff --git a/examples/lib/uniform.js b/examples/lib/uniform.js
@@ -1,4 +1,4 @@
-// Uniform v0.2.0
+// Uniform v0.2.1
 // Written by Luke Morton, MIT licensed.
 // https://github.com/DrPheltRight/uniform
 !function (definition) {
@@ -38,13 +38,18 @@ Uniform = (function() {
     var key, val;
     for (key in settings) {
       val = settings[key];
-      this[key] = val;
+      if (key !== 'events') this[key] = val;
     }
     this.uid || (this.uid = ++Uniform.uniqueCounter);
     this.$ || (this.$ = require('jquery'));
     if (!(this.el && (this.el.length != null))) this.el = this.buildTemplate();
     this.cacheElements();
-    this.delegateEvents();
+    if ((settings != null ? settings.events : void 0) != null) {
+      this.delegateEvents(settings.events);
+      delete settings.events;
+    } else {
+      this.delegateEvents();
+    }
     this.init();
   }
 

diff --git a/examples/lib/uniform.min.js b/examples/lib/uniform.min.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "author": "Luke Morton <lukemorton.designs@gmail.com> (http://lukemorton.co.uk)",
   "name": "Uniform",
   "description": "Uniform is a ViewController for the masses",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "homepage": "http://github.com/DrPheltRight/uniform",
   "repository": {
     "type": "git",

diff --git a/src/uniform.coffee b/src/uniform.coffee
@@ -44,12 +44,24 @@ class Uniform
   #  - @events are delegated
   #  - @init() is called
   constructor: (settings) ->
-    @[key] = val for key, val of settings
+    for key, val of settings
+      # Merge all but events
+      @[key] = val unless key is 'events'
+
     @uid or= ++Uniform.uniqueCounter
     @$ or= require 'jquery'
     @el = @buildTemplate() unless @el and @el.length?
     @cacheElements()
-    @delegateEvents()
+
+    # We want to append events defined here to previously
+    # defined ones, we don't want the foreach to overwrite
+    # the originals
+    if settings?.events?
+      @delegateEvents(settings.events)
+      delete settings.events
+    else
+      @delegateEvents()
+
     @init()
 
   # By default @init() does nothing