@@ -1,3 +1,8 @@

+/**

+ * This file is part of JIM <https://github.com/fiddlerwoaroof/jim/> (c) 2016 Edward Langley

+ *

+ * See the COPYING document in the root of the source distribution for licensing information.

+ */

 function PresentationTypeError(msg, expectedType, actualVal) {

   if (this instanceof TypeError) {

     return new TypeError(msg, expectedType, actualVal);

@@ -113,6 +118,7 @@ Command = (function() {

           throw new PresentationTypeError('wrong type', this.types[idx], args[idx]);

         }

       }

+      args.push(this.cursor.activator);

       this.execute.apply(this, args);

     },

@@ -122,6 +128,7 @@ Command = (function() {

       }

       this.cursor = TypeCursor(this.types);

+      this.cursor.activator = theEvent.target;

       this.cursor.activate().then(this.run.bind(this));

       return true;

@@ -1,3 +1,8 @@

+/**

+ * This file is part of JIM <https://github.com/fiddlerwoaroof/jim/> (c) 2016 Edward Langley

+ *

+ * See the COPYING document in the root of the source distribution for licensing information.

+ */

 PresentationType = (function () {

   var presentationTypes = {};

@@ -27,8 +32,8 @@ PresentationType = (function () {

     isOfType(name) {

       var type = presentationTypes[name];

-      console.log(name);

-      console.log(type);

+      //console.log(name);

+      //console.log(type);

       return type.isPrototypeOf(this);

     },

@@ -78,39 +83,44 @@ PresentationType = (function () {

     },

     bindTags() {

-      var els = this.selectAllTags().filter(function (theEl) { return theEl.ptObject === undefined; });

+      var els = this.selectAllTags().filter(function (theEl) {

+        return theEl.ptObject === undefined;

+      });

-      els.forEach(function (theEl) {

-        var content = theEl.textContent.trim();

-        var value = theEl.value;

+      els.forEach(this.bindEl, this);

+      return this;

+    },

-        var bindTypes = theEl.dataset.bind;

-        if (bindTypes !== undefined) {

-          bindTypes = bindTypes.split(',');

-        } else {

-          bindTypes = ['click'];

-        }

+    bindEl(theEl) {

+      var content = theEl.textContent.trim();

+      var value = theEl.value;

-        console.log('bt',bindTypes);

+      var bindTypes = theEl.dataset.bind;

+      if (bindTypes !== undefined) {

+        bindTypes = bindTypes.split(',');

+      } else {

+        bindTypes = ['click'];

+      }

-        if (! theEl.hasAttribute('value') ) {

-          var tmpVal = theEl.dataset.value;

-          value = tmpVal === undefined ? content : theEl.dataset.value;

-        }

+      //console.log('bt',bindTypes);

-        this.wrapTag(theEl, value, bindTypes, content);

-      }, this);

+      if (! theEl.hasAttribute('value') ) {

+        var tmpVal = theEl.dataset.value;

+        value = tmpVal === undefined ? content : theEl.dataset.value;

+      }

-      return this;

+      return this.wrapTag(theEl, value, bindTypes, content);

     },

     wrapTag(tag, value, bindTypes, content) {

-      var result = Object.assign(Object.create(this), {

-        tag: tag,

-        value: value,

-        display: content,

-      });

+      var result = Object.assign(

+        Object.create(this), {

+          tag: tag,

+          value: value,

+          display: content,

+        }

+      );

       tag.ptObject = result;

       this.classes.forEach(function (cls) {

@@ -118,7 +128,7 @@ PresentationType = (function () {

       });

       bindTypes.forEach(function (event) {

-        console.log(event);

+        //console.log(event);

         tag.addEventListener(event, result, false);

       });

@@ -183,7 +193,7 @@ PresentationType = (function () {

     },

     handleEvent(theEvent) {

-      console.log('handling: ',theEvent);

+      //console.log('handling: ',theEvent);

       var handler = this[theEvent.type];

       var result = true;

       if (handler !== undefined) {

@@ -219,6 +229,7 @@ PresentationType = (function () {

     },

     activateAll() {

+      this.bindTags();

       var els = this.selectAllTags();

       els.forEach(function (el) {

@@ -231,5 +242,18 @@ PresentationType = (function () {

   };

+  var typeType = PresentationType('type');

+  typeType.generateTags = function (tagName) {

+    if (tagName === undefined) {

+      tagName = 'span';

+    }

+

+    return Object.keys(presentationTypes).map(

+      function (type) {

+        var tag = document.createElement(tagName);

+        return this.wrapTag(tag, type, ['click'], type);

+      }, this

+    );

+  };

   return PresentationType;

 })();