Merge master into release branch

Author: jcbrand

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "patterns",
-  "version": "2.0.1",
+  "version": "2.0.6",
   "main": "bundle.js",
   "devDependencies": {
     "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x"

build.js

@@ -41,6 +41,7 @@
 
         // Core
         "pat-utils": "core/utils",
+        "pat-pluggable": "core/pluggable",
         "pat-compat": "core/compat",
         "pat-jquery-ext": "core/jquery-ext",
         "pat-logger": "core/logger",

changes.md

@@ -4,6 +4,14 @@
 
 - #383 pat-equaliser sets the height to early
 
+## 2.0.6 - Dec. 10, 2014
+
+- New core module pluggable.js which allows the creation of Pluggable patterns.
+ 
+## 2.0.5 - Dec. 4, 2014
+
+- #383 pat-equaliser sets the height to early
+
 ## 2.0.4 - Oct. 7, 2014
 
 - spectrum lib for colour picker now defaults to hsv values. Keep hex as default for backward compatibility (SLC ref 9849)

package.json

@@ -1,6 +1,6 @@
 {
     "name": "patterns",
-    "version": "2.0.1",
+    "version": "2.0.6",
     "title": "Markup patterns to drive behaviour.",
     "description":
     "Patterns is a JavaScript library that enables designers to build rich interactive prototypes without the need for writing any Javascript. All events are triggered by classes and other attributes in the HTML, without abusing the HTML as a programming language. Accessibility, SEO and well structured HTML are core values of Patterns.",

src/core/pluggable.js

@@ -0,0 +1,24 @@
+define([
+    "jquery",
+    "pat-utils"
+], function($, utils) {
+    var pluggable = {
+
+        extend: function (attrs) {
+            return utils.extend(this, attrs);
+        },
+
+        registerPlugin: function (name, callback) {
+            this.plugins[name] = callback;
+        },
+
+        initializePlugins: function () {
+            var args = arguments;
+            _.each(_.keys(this.plugins), $.proxy(function (k) {
+                $.proxy(this.plugins[k], this)(this, args);
+            }, this));
+            return args;
+        }
+    };
+    return pluggable;
+});

src/core/utils.js

@@ -24,6 +24,7 @@ define([
         return plugin;
     };
 
+
     //     Underscore.js 1.3.1
     //     (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
     //     Underscore is freely distributable under the MIT license.
@@ -46,13 +47,35 @@ define([
             clearTimeout(timeout);
             timeout = setTimeout(later, wait);
         };
-    };
+    }
+
+    // Is a given variable an object?
+    function isObject(obj) {
+        var type = typeof obj;
+        return type === 'function' || type === 'object' && !!obj;
+    }
+
+    // Extend a given object with all the properties in passed-in object(s).
+    function extend(obj) {
+        if (!isObject(obj)) return obj;
+        var source, prop;
+        for (var i = 1, length = arguments.length; i < length; i++) {
+            source = arguments[i];
+            for (prop in source) {
+                if (hasOwnProperty.call(source, prop)) {
+                    obj[prop] = source[prop];
+                }
+            }
+        }
+        return obj;
+    }
+    // END: Taken from Underscore.js until here.
 
     function rebaseURL(base, url) {
         if (url.indexOf("://")!==-1 || url[0]==="/")
             return url;
         return base.slice(0, base.lastIndexOf("/")+1) + url;
-    };
+    }
 
     function findLabel(input) {
         for (var label=input.parentNode; label && label.nodeType!==11; label=label.parentNode)
@@ -183,6 +206,8 @@ define([
         jquery_plugin: jquery_plugin,
         debounce: debounce,
         escapeRegExp: escapeRegExp,
+        isObject: isObject,
+        extend: extend,
         rebaseURL: rebaseURL,
         findLabel: findLabel,
         elementInViewport: elementInViewport,