improved the way binding happens, allowing filtered child elems by de…

…fault
dhigginbotham · Sep 15, 2015 · c4baa50 · c4baa50
1 parent 633db9d
commit c4baa50
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/.publish b/.publish
diff --git a/dist/murk.js b/dist/murk.js
diff --git a/dist/murk.js.gz b/dist/murk.js.gz
diff --git a/examples/build/templates/repeat-example.tmpl b/examples/build/templates/repeat-example.tmpl
@@ -28,7 +28,7 @@
   <div class="hero">
     <div data-murk="repeatedExample" data-murk-id="repeat">
       <div>
-        Name: <span data-murk-repeat-key="name" data-murk-repeat-bind="true" data-murk-filter="highlightText"></span>
+        Name: <span data-murk-repeat-key="name" data-murk-filter="highlightText"></span>
       </div>
       <div>
         Age: <span data-murk-repeat-key="age"></span>

diff --git a/examples/index.html b/examples/index.html
@@ -149,7 +149,7 @@ <h3 name="repeat-example">Repeat Example: </h3>
   <div class="hero">
     <div data-murk="repeatedExample" data-murk-id="repeat">
       <div>
-        Name: <span data-murk-repeat-key="name" data-murk-repeat-bind="true" data-murk-filter="highlightText"></span>
+        Name: <span data-murk-repeat-key="name" data-murk-filter="highlightText"></span>
       </div>
       <div>
         Age: <span data-murk-repeat-key="age"></span>

diff --git a/examples/js/murk.js b/examples/js/murk.js
@@ -1,10 +1,10 @@
-var murk = (function(fn) {
+;(function(def, fn) {
   if (typeof module != 'undefined' && module.exports) {
     module.exports = fn;
   } else {
-    return fn;
+    window[def] = fn;
   }
-})(function(options) {
+})('murk', function murk(options) {
   if (!(this instanceof murk)) return new murk(options);
   // state reference, mostly for 
   // dev/internal use and context
@@ -24,7 +24,6 @@ var murk = (function(fn) {
     selectorPrefix: 'data-murk',
     dev: false,
     id: state.start,
-    bindRepeats: false,
     defaultSubscribers: [handleRepeat, elemBindingEvent, processFiltersEvent, trackCountEvent]
   };
 
@@ -45,6 +44,7 @@ var murk = (function(fn) {
     // this way you're not overwriting
     // the model unless you intend to
     merge = (typeof merge != 'undefined' ? merge : true);
+
     if (typeof str != 'undefined' && typeof obj == 'string') {
       state.model[obj] = str;
       // if we've set this elem before we'll
@@ -174,7 +174,7 @@ var murk = (function(fn) {
           // hey, if you want to bind repeats --
           // know that it's possible with this opt
           // but also know it isn't quite as performant
-          if (opts.bindRepeats || isBind) {
+          if (isBind) {
             var $$key = this.$key + '.' + repeatKey;
             if (!atts(opts.selectorPrefix)) {
               atts(opts.selectorPrefix, $$key);
@@ -332,9 +332,9 @@ var murk = (function(fn) {
 
   // handles dom manipulation
   function setupTextNode(el, val) {
-    var tn;
     if (typeof val != 'undefined') {
-      tn = document.createTextNode(val);
+      if (val === 'null' || val === null) val = '';
+      var tn = document.createTextNode(val);
       if (el.hasChildNodes()) {
         el.childNodes[0].nodeValue = val;
       } else {

diff --git a/src/murk.js b/src/murk.js
@@ -1,10 +1,10 @@
-var murk = (function(fn) {
+;(function(def, fn) {
   if (typeof module != 'undefined' && module.exports) {
     module.exports = fn;
   } else {
-    return fn;
+    window[def] = fn;
   }
-})(function(options) {
+})('murk', function murk(options) {
   if (!(this instanceof murk)) return new murk(options);
   // state reference, mostly for 
   // dev/internal use and context
@@ -24,7 +24,6 @@ var murk = (function(fn) {
     selectorPrefix: 'data-murk',
     dev: false,
     id: state.start,
-    bindRepeats: false,
     defaultSubscribers: [handleRepeat, elemBindingEvent, processFiltersEvent, trackCountEvent]
   };
 
@@ -45,6 +44,7 @@ var murk = (function(fn) {
     // this way you're not overwriting
     // the model unless you intend to
     merge = (typeof merge != 'undefined' ? merge : true);
+
     if (typeof str != 'undefined' && typeof obj == 'string') {
       state.model[obj] = str;
       // if we've set this elem before we'll
@@ -174,7 +174,7 @@ var murk = (function(fn) {
           // hey, if you want to bind repeats --
           // know that it's possible with this opt
           // but also know it isn't quite as performant
-          if (opts.bindRepeats || isBind) {
+          if (isBind) {
             var $$key = this.$key + '.' + repeatKey;
             if (!atts(opts.selectorPrefix)) {
               atts(opts.selectorPrefix, $$key);
@@ -332,9 +332,9 @@ var murk = (function(fn) {
 
   // handles dom manipulation
   function setupTextNode(el, val) {
-    var tn;
     if (typeof val != 'undefined') {
-      tn = document.createTextNode(val);
+      if (val === 'null' || val === null) val = '';
+      var tn = document.createTextNode(val);
       if (el.hasChildNodes()) {
         el.childNodes[0].nodeValue = val;
       } else {