d6 - npm Package Compare versions

Comparing version 0.0.10 to 0.1.0

d6-client.js

 /**
- *  ____   __      ____ _ _            _            ___   ___   _  ___
- * |  _ \ / /_    / ___| (_) ___ _ __ | |_  __   __/ _ \ / _ \ / |/ _ \
- * | | | | '_ \  | |   | | |/ _ \ '_ \| __| \ \ / / | | | | | || | | | |
- * | |_| | (_) | | |___| | |  __/ | | | |_   \ V /| |_| | |_| || | |_| |
- * |____/ \___/   \____|_|_|\___|_| |_|\__|   \_/  \___(_)___(_)_|\___/
+ *  ____   __      ____ _ _            _            ___   _   ___
+ * |  _ \ / /_    / ___| (_) ___ _ __ | |_  __   __/ _ \ / | / _ \
+ * | | | | '_ \  | |   | | |/ _ \ '_ \| __| \ \ / / | | || || | | |
+ * | |_| | (_) | | |___| | |  __/ | | | |_   \ V /| |_| || || |_| |
+ * |____/ \___/   \____|_|_|\___|_| |_|\__|   \_/  \___(_)_(_)___/
  *
@@ -1578,4 +1578,2 @@ *
 
-  var body;
-
   /**
@@ -1586,6 +1584,4 @@ * Initialization binds event handlers.
 
-    body = document.body;
-
     // When a same-domain link is clicked, fetch it via XMLHttpRequest.
-    on(body, 'a', 'click', function (a, event) {
+    on('a', 'click', function (a, event) {
       var url = removeHash(a.href);
@@ -1596,3 +1592,3 @@ var buttonNumber = event.which;
         preventDefault(event);
-        loadUrl(url);
+        loadUrl(url, 0, a);
       }
@@ -1603,3 +1599,3 @@ });
     // TODO: Use mouse movement to detect probably targets.
-    on(body, 'a', 'mouseover', function (a, event) {
+    on('a', 'mouseover', function (a, event) {
       if (!hasClass(a, '_NOPREFETCH')) {
@@ -1615,3 +1611,3 @@ var url = removeHash(a.href);
     // When a form field changes, timestamp the form.
-    var inputChanged = function (input) {
+    on('input,select,textarea', 'change', function (input) {
       var form = input.form;
@@ -1621,9 +1617,6 @@ if (form) {
       }
-    };
-    on(body, 'input', 'change', inputChanged);
-    on(body, 'select', 'change', inputChanged);
-    on(body, 'textarea', 'change', inputChanged);
+    });
 
     // When a form button is clicked, attach it to the form.
-    var buttonClicked = function (button) {
+    on('input,button', 'click', function (button) {
       if (button.type == 'submit') {
@@ -1638,9 +1631,7 @@ var form = button.form;
       }
-    };
-    on(body, 'input', 'click', buttonClicked);
-    on(body, 'button', 'click', buttonClicked);
+    });
 
     // When a form is submitted, gather its data and submit via XMLHttpRequest.
-    on(body, 'form', 'submit', function (form, event) {
-      var url = removeHash(form.action);
+    on('form', 'submit', function (form, event) {
+      var url = removeHash(form.action || location.href.replace(/\?.*$/, ''));
       var isGet = (lower(form.method) == 'get');
@@ -1683,3 +1674,3 @@ if (isSameDomain(url)) {
         // Submit form data to the URL.
-        loadUrl(url, data);
+        loadUrl(url, data, form);
       }
@@ -1749,6 +1740,14 @@ });
    */
-  var loadUrl = D6._LOAD_URL = function (url, data) {
+  var loadUrl = D6._LOAD_URL = function (url, data, sourceElement) {
     D6._LOADING_URL = removeD6Param(url);
     D6._LOAD_STARTED = getTime();
 
+    var targetSelector = getData(sourceElement, '_D6_TARGET');
+    var targetView = getData(sourceElement, '_D6_VIEW');
+    if (targetSelector) {
+      all(targetSelector, function (element) {
+        addClass(element, '_D6_TARGET');
+      });
+    }
+
     //+env:debug
@@ -1763,2 +1762,6 @@ log('[D6] Loading "' + url + '".');
 
+    var handler = function (context, url) {
+      renderResponse(context, url, targetSelector, targetView);
+    };
+
     // A resource is either a cached response, a callback queue, or nothing.
@@ -1772,3 +1775,3 @@ var resource = cache[url];
       //-env:debug
-      cache[url] = [renderResponse];
+      cache[url] = [handler];
       getD6Json(url, data);
@@ -1781,3 +1784,3 @@ }
       //-env:debug
-      push(resource, renderResponse);
+      push(resource, handler);
     }
@@ -1789,3 +1792,3 @@ // If the resource exists and isn't an array, render it.
       //-env:debug
-      renderResponse(resource, url);
+      handler(resource, url);
     }
@@ -1822,7 +1825,7 @@ };
   // Render a template with the given context, and display the resulting HTML.
-  var renderResponse = function (context, requestUrl) {
+  var renderResponse = function (context, requestUrl, targetSelector, targetView) {
     D6._CONTEXT = context;
     var err = context._ERROR;
     var responseUrl = removeD6Param(context.d6u || requestUrl);
-    var viewName = context.d6 || 'error0';
+    var viewName = targetView || context.d6 || 'error0';
     var view = D6._VIEW = views[viewName];
@@ -1836,3 +1839,3 @@ var html;
       // Reset any spinners.
-      all('._SPINNER', function (spinner) {
+      all('._SPINNER,._D6_TARGET', function (spinner) {
         removeClass(spinner, '_LOADING');
@@ -1868,3 +1871,3 @@ });
     if (html) {
-      writeHtml(html);
+      writeHtml(html, targetSelector);
 
@@ -1882,3 +1885,3 @@ // Change the location bar to reflect where we are now.
    */
-  var writeHtml = function (html) {
+  var writeHtml = function (html, targetSelector) {
     match(html, /<title.*?>([\s\S]+)<\/title>/, function (tag, title) {
@@ -1895,8 +1898,21 @@ document.title = title;
     });
-    match(html, /<body.*?>([\s\S]+)<\/body>/, function (tag, html) {
-      setHtml(body, html);
-      body.scrollTop = 0;
-    });
-    scripts.forEach(execute);
-    onReady();
+    // If we're just replacing the HTML of a target element, do so.
+    if (targetSelector) {
+      all(targetSelector, function (element) {
+        setHtml(element, html);
+      });
+      forEach(scripts, execute);
+      all(targetSelector, function (element) {
+        onReady(element);
+      });
+    }
+    // Otherwise, grab the body content, and mimic a page transition.
+    else {
+      match(html, /<body.*?>([\s\S]+)<\/body>/, function (tag, html) {
+        setHtml(body, html);
+        body.scrollTop = 0;
+      });
+      forEach(scripts, execute);
+      onReady(document);
+    }
   };
@@ -1915,2 +1931,3 @@
   });
+
   insertScript('/d6.js?' + cacheBust);
@@ -1917,0 +1934,0 @@

d6-client.min.js

@@ -1,1 +0,1 @@
-!function(n){var t=function(){},e=t,r=t,o=function(){var t=n.XMLHttpRequest,e=n.ActiveXObject;return t?new t:e?new e("Microsoft.XMLHTTP"):!1},i=function(n,t,u,c){z(t)&&(c=u,u=t,t=0);var a=o();return a&&(c=c||r,u=u||e,a.onreadystatechange=function(){if(4==a.readyState){k('[Jymin] Received response from "'+n+'". ('+i._WAITING+" in progress)."),--i._WAITING;var t=a.status,o=200==t,f=o?u||e:c||r,s=parse(a.responseText);s._STATUS=t,s._REQUEST=a,f(s)}},a.open(t?"POST":"GET",n,!0),a.setRequestHeader("x-requested-with","XMLHttpRequest"),t&&a.setRequestHeader("content-type","application/x-www-form-urlencoded"),a._URL=n,t&&(a._BODY=t),a._TIME=getTime(),i._WAITING=(i._WAITING||0)+1,k('[Jymin] Sending request to "'+n+'". ('+i._WAITING+" in progress)."),a.send(t||null)),!0},u=function(n,t){if(n)for(var e=0,r=f(n);r>e;e++){var o=t(n[e],e,n);if(o===!1)break}},c=function(n,t){if(n)for(var e in n){var r=t(e,n[e],n);if(r===!1)break}},a=function(n,t){return n&&t&&c(t,function(t,e){n[t]=e}),n},f=function(n){return Z(n)||Y(n)?n.length:0},s=function(n){return f(n)>1},l=function(n,t){return nt(n)&&n.push(t),t},p=function(n){for(var t=function(t){n.push(t)},e=1,r=arguments.length;r>e;e++)u(arguments[e],t)},d=function(n,t){return f(arguments)<2&&(t=n,n=document),Y(t)?n.getElementById(t):t},v=function(n,t){return f(arguments)<2&&(t=n,n=document),n.getElementsByTagName(t||"*")},m=function(n,t){f(arguments)<2&&(t=n,n=document),t=t.split(".");var e,r=(t[0]||"*").toUpperCase(),o=t[1],i="*"==r;return o?(e=[],n.getElementsByClassName?u(n.getElementsByClassName(o),function(n){(i||n.tagName==r)&&e.push(n)}):u(v(n,r),function(n){L(n,o)&&e.push(n)})):e=v(n,r),e},g=function(n,t){var e=(d(n)||{}).parentNode;return t&&e&&e.tagName!=t&&(e=g(e,t)),e},_=function(n){if(!Y(n))return n;n=n||"";var t=n.split("?"),e=t[0].split("."),r=e.slice(1).join(" "),o=e[0].split("#"),i=o[0]||"div",c=o[1],a=t[1],f=_[i]||(_[i]=document.createElement(i)),s=f.cloneNode(!0);return c&&(s.id=c),r&&(s.className=r),a&&(a=a.split("&"),u(a,function(n){var t=n.split("="),e=$(t[0]),r=$(t[1]);s[e]=r,s.setAttribute(e,r)})),s},h=function(n,t,e){var r=_(t);return n&&N(n,r,e),r},T=function(n){return d(n).childNodes},N=function(n,t,e){n=d(n),t=d(t),n&&t&&(Q(e)&&(e=T(n)[e]),n.insertBefore(t,e||null))},E=function(n,t){n=d(n),n&&(n.innerHTML=t)},D=function(n){return n=d(n),n?n.className:void 0},L=function(n,t){var e=new RegExp("(^|\\s)"+t+"(\\s|$)");return e.test(D(n))},R=function(n,t){n=d(n),n&&(n.className+=" "+t)},I=function(n,t){if(n=d(n)){var e=D(n).split(/\s/),r=[];u(e,function(n){n!=t&&r.push(n)}),n.className=r.join(" ")}},y=function(n,t){var e=v("head")[0],r=h(e,"script");t&&(r.onload=t,r.onreadystatechange=function(){O(r)&&t()}),r.src=n},A=function(n,t,e){(!t||z(t))&&(e=t,t=n,n=document);var r;if(q(t,",")){r=[];var o=P(t);u(o,function(t){var e=A(n,t);f(e)&&p(r,e)})}else if(q(t," ")){var i=t.indexOf(" "),c=t.substr(0,i),a=t.substr(i+1);r=[],A(n,c,function(n){var t=A(n,a);p(r,t)})}else if("#"==t[0]){var s=d(n,t.substr(1));r=s?[s]:[]}else r=m(n,t);return e&&u(r,e),r},C=function(t,e,r,o,i){if(q(e," ")){var c=X(e);return void u(c,function(n){C(t,n,r,o,i)})}if(t=d(t)){var a=function(u){u=u||n.event;var c=u.target||u.srcElement;3==c.nodeType&&(c=g(c));var a=u.relatedTarget||u.toElement;if("mouseout"==e)for(;a=g(a);)if(a==c)return;return r(t,u,c,i||o)};t.addEventListener?t.addEventListener(e,a,!0):t.attachEvent?t.attachEvent("on"+e,a):t["on"+e]=a;var f=t._HANDLERS=t._HANDLERS||{},s=f[e]=f[e]||[];l(s,r)}},b=function(n){n.preventDefault()},S=function(n,t,e,r,o,i){t=t.split(".");var u=t[0].toUpperCase(),c=t[1],a=function(n,t,e,o){return u&&e.tagName!=u||c&&!L(e,c)?(e=g(e),void(e&&a(n,t,e,o))):r(e,t,n,i||o)};C(n,e,a,o)},O=function(n){var t=n.readyState;return"complete"==t||"script"==n.tagName&&"loaded"==t},H=function(n){if(n=d(n)){var t=n.type[0],e=n.value,r=n.checked,o=n.options;return"c"==t||"r"==t?e=r?e:null:n.multiple?(e=[],u(o,function(n){n.selected&&l(e,n.value)})):o&&(e=o[n.selectedIndex].value),e}},U=function(){var t=n.history||{};return u(["push","replace"],function(n){var e=t[n+"State"];t[n]=function(n){e&&e.apply(t,[null,null,n])}}),t},w=function(n){U().push(n)},G=function(t){C(n,"popstate",t)},x=function(){B("error",arguments)},k=function(){B("log",arguments)},B=function(t,e){var r=n.console;r&&r[t]&&r[t].apply(r,e)},j=function(n){return Y(n)?n:""+n},q=function(n,t){return j(n).indexOf(t)>-1},M=function(n,t){return 0==j(n).indexOf(t)},W=function(n){return j(n).replace(/^\s+|\s+$/g,"")},P=function(n){return j(n).split(",")},X=function(n){return j(n).split(" ")},F=function(n,t,e){var r=n.match(t);r&&e.apply(n,r)},K=function(n){return j(n).toLowerCase()},V=function(n){return encodeURIComponent(n)},$=function(n){return decodeURIComponent(n)},J=function(n,t){return typeof n==t},Q=function(n){return J(n,"number")},Y=function(n){return J(n,"string")},z=function(n){return J(n,"function")},Z=function(n,t){return n instanceof(t||Object)},nt=function(n){return Z(n,Array)};!function(){var t,e,r=n.D6=function(n){a(o,n),f||p()},o=r._VIEWS={},c=r._CACHE={},f=!1,p=function(){t=document.body,S(t,"a","click",function(n,t){var e=m(n.href),r=t.which,o=!r||1==r;d(e)&&o&&(b(t),T(e))}),S(t,"a","mouseover",function(n){if(!L(n,"_NOPREFETCH")){var t=m(n.href),e=t!=m(location);e&&d(t)&&h(t)}});var n=function(n){var t=n.form;t&&(t._LAST_CHANGED=getTime())};S(t,"input","change",n),S(t,"select","change",n),S(t,"textarea","change",n);var e=function(n){if("submit"==n.type){var t=n.form;t&&t._CLICKED_BUTTON!=n&&(t._CLICKED_BUTTON=n,t._LAST_CHANGED=getTime())}};S(t,"input","click",e),S(t,"button","click",e),S(t,"form","submit",function(n,t){var e=m(n.action),r="get"==K(n.method);if(d(e)){b(t);var o=[];A(n,"input,select,textarea,button",function(t){var e=t.name,r=t.type,i=H(t),c=!e;c=c||"radio"==r&&!i,c=c||"submit"==r&&t!=n._CLICKED_BUTTON,c||(Y(i)?l(o,V(e)+"="+V(i)):u(i,function(n){l(o,V(e)+"="+V(n))}))}),r?(e+=(q(e,"?")?"&":"?")+o.join("&"),o=0):(e=g(e,n._LAST_CHANGED),o=o.join("&")),T(e,o)}});G(function(){T(location)}),f=!0},d=function(n){return M(n,location.protocol+"//"+location.host+"/")},m=function(n){return j(n).replace(/#.*$/,"")},g=function(n,t){return n+(q(n,"?")?"&":"?")+"d6="+(t||1)},_=function(n){return j(n).replace(/[&\?]d6=[r\d]+/g,"")},h=function(n){c[n]||(k('[D6] Prefetching "'+n+'".'),c[n]=[function(t){k('[D6] Caching contents for prefetched URL "'+n+'".'),c[n]=t;var e=t.ttl||1e4;setTimeout(function(){nt(c[n])||(k('[D6] Removing "'+n+'" from prefetch cache.'),delete c[n])},e)}],N(n))},T=r._LOAD_URL=function(n,t){r._LOADING_URL=_(n),r._LOAD_STARTED=getTime(),k('[D6] Loading "'+n+'".'),A("._SPINNER",function(n){R(n,"_LOADING")});var e=c[n];e?nt(e)?(k('[D6] Queueing callback for "'+n+'".'),l(e,D)):(k('[D6] Found precached response for "'+n+'".'),D(e,n)):(k('[D6] Creating callback queue for "'+n+'".'),c[n]=[D],N(n,t))},N=function(n,t){k('[D6] Fetching response for "'+n+'".');var e=g(n),r=function(t){var e=c[n];c[n]=t,k("[D6] Running "+e.length+' callback(s) for "'+n+'".'),u(e,function(e){e(t,n)})};i(e,t,r,r,1)},D=function(t,e){r._CONTEXT=t;var i,u=(t._ERROR,_(t.d6u||e)),a=t.d6||"error0",f=r._VIEW=o[a];e=_(e),e==r._LOADING_URL&&(A("._SPINNER",function(n){I(n,"_LOADING")}),"<"==W(t)[0]?(i=t,k("[D6] Rendering HTML string")):f?(i=f.call(o,t),k('[D6] Rendering view "'+a+'".')):(x('[D6] View "'+a+'" not found. Changing location.'),n.location=u)),i&&(C(i),w(u),delete c[e])},C=function(n){F(n,/<title.*?>([\s\S]+)<\/title>/,function(n,t){document.title=t});var e=[];n=n.replace(/<script.*?>([\s\S]*?)<\/script>/g,function(n,t){return t&&(e.push(t),n=""),n}),F(n,/<body.*?>([\s\S]+)<\/body>/,function(n,e){E(t,e),t.scrollTop=0}),e.forEach(execute),onReady()},O=v("script");u(O,function(n){var t=j(n.src).split("?");s(t)&&(e=t[1])}),y("/d6.js?"+e)}()}(window);
+!function(n){var t=function(){},e=t,r=t,o=function(){var t=n.XMLHttpRequest,e=n.ActiveXObject;return t?new t:e?new e("Microsoft.XMLHTTP"):!1},i=function(n,t,u,c){z(t)&&(c=u,u=t,t=0);var a=o();return a&&(c=c||r,u=u||e,a.onreadystatechange=function(){if(4==a.readyState){B('[Jymin] Received response from "'+n+'". ('+i._WAITING+" in progress)."),--i._WAITING;var t=a.status,o=200==t,f=o?u||e:c||r,s=parse(a.responseText);s._STATUS=t,s._REQUEST=a,f(s)}},a.open(t?"POST":"GET",n,!0),a.setRequestHeader("x-requested-with","XMLHttpRequest"),t&&a.setRequestHeader("content-type","application/x-www-form-urlencoded"),a._URL=n,t&&(a._BODY=t),a._TIME=getTime(),i._WAITING=(i._WAITING||0)+1,B('[Jymin] Sending request to "'+n+'". ('+i._WAITING+" in progress)."),a.send(t||null)),!0},u=function(n,t){if(n)for(var e=0,r=f(n);r>e;e++){var o=t(n[e],e,n);if(o===!1)break}},c=function(n,t){if(n)for(var e in n){var r=t(e,n[e],n);if(r===!1)break}},a=function(n,t){return n&&t&&c(t,function(t,e){n[t]=e}),n},f=function(n){return Z(n)||Y(n)?n.length:0},s=function(n){return f(n)>1},l=function(n,t){return nt(n)&&n.push(t),t},p=function(n){for(var t=function(t){n.push(t)},e=1,r=arguments.length;r>e;e++)u(arguments[e],t)},d=function(n,t){return f(arguments)<2&&(t=n,n=document),Y(t)?n.getElementById(t):t},v=function(n,t){return f(arguments)<2&&(t=n,n=document),n.getElementsByTagName(t||"*")},m=function(n,t){f(arguments)<2&&(t=n,n=document),t=t.split(".");var e,r=(t[0]||"*").toUpperCase(),o=t[1],i="*"==r;return o?(e=[],n.getElementsByClassName?u(n.getElementsByClassName(o),function(n){(i||n.tagName==r)&&e.push(n)}):u(v(n,r),function(n){R(n,o)&&e.push(n)})):e=v(n,r),e},g=function(n,t){var e=(d(n)||{}).parentNode;return t&&e&&e.tagName!=t&&(e=g(e,t)),e},_=function(n){if(!Y(n))return n;n=n||"";var t=n.split("?"),e=t[0].split("."),r=e.slice(1).join(" "),o=e[0].split("#"),i=o[0]||"div",c=o[1],a=t[1],f=_[i]||(_[i]=document.createElement(i)),s=f.cloneNode(!0);return c&&(s.id=c),r&&(s.className=r),a&&(a=a.split("&"),u(a,function(n){var t=n.split("="),e=K(t[0]),r=K(t[1]);s[e]=r,s.setAttribute(e,r)})),s},T=function(n,t,e){var r=_(t);return n&&h(n,r,e),r},E=function(n){return d(n).childNodes},h=function(n,t,e){n=d(n),t=d(t),n&&t&&(Q(e)&&(e=E(n)[e]),n.insertBefore(t,e||null))},N=function(n,t){n=d(n),n&&(n.innerHTML=t)},D=function(n){return n=d(n),n?n.className:void 0},R=function(n,t){var e=new RegExp("(^|\\s)"+t+"(\\s|$)");return e.test(D(n))},A=function(n,t){n=d(n),n&&(n.className+=" "+t)},L=function(n,t){if(n=d(n)){var e=D(n).split(/\s/),r=[];u(e,function(n){n!=t&&r.push(n)}),n.className=r.join(" ")}},y=function(n,t){var e=v("head")[0],r=T(e,"script");t&&(r.onload=t,r.onreadystatechange=function(){O(r)&&t()}),r.src=n},I=function(n,t,e){(!t||z(t))&&(e=t,t=n,n=document);var r;if(j(t,",")){r=[];var o=P(t);u(o,function(t){var e=I(n,t);f(e)&&p(r,e)})}else if(j(t," ")){var i=t.indexOf(" "),c=t.substr(0,i),a=t.substr(i+1);r=[],I(n,c,function(n){var t=I(n,a);p(r,t)})}else if("#"==t[0]){var s=d(n,t.substr(1));r=s?[s]:[]}else r=m(n,t);return e&&u(r,e),r},C=function(t,e,r,o,i){if(j(e," ")){var c=X(e);return void u(c,function(n){C(t,n,r,o,i)})}if(t=d(t)){var a=function(u){u=u||n.event;var c=u.target||u.srcElement;3==c.nodeType&&(c=g(c));var a=u.relatedTarget||u.toElement;if("mouseout"==e)for(;a=g(a);)if(a==c)return;return r(t,u,c,i||o)};t.addEventListener?t.addEventListener(e,a,!0):t.attachEvent?t.attachEvent("on"+e,a):t["on"+e]=a;var f=t._HANDLERS=t._HANDLERS||{},s=f[e]=f[e]||[];l(s,r)}},b=function(n){n.preventDefault()},S=function(n,t,e,r,o,i){t=t.split(".");var u=t[0].toUpperCase(),c=t[1],a=function(n,t,e,o){return u&&e.tagName!=u||c&&!R(e,c)?(e=g(e),void(e&&a(n,t,e,o))):r(e,t,n,i||o)};C(n,e,a,o)},O=function(n){var t=n.readyState;return"complete"==t||"script"==n.tagName&&"loaded"==t},G=function(n){if(n=d(n)){var t=n.type[0],e=n.value,r=n.checked,o=n.options;return"c"==t||"r"==t?e=r?e:null:n.multiple?(e=[],u(o,function(n){n.selected&&l(e,n.value)})):o&&(e=o[n.selectedIndex].value),e}},H=function(){var t=n.history||{};return u(["push","replace"],function(n){var e=t[n+"State"];t[n]=function(n){e&&e.apply(t,[null,null,n])}}),t},U=function(n){H().push(n)},w=function(t){C(n,"popstate",t)},x=function(){k("error",arguments)},B=function(){k("log",arguments)},k=function(t,e){var r=n.console;r&&r[t]&&r[t].apply(r,e)},W=function(n){return Y(n)?n:""+n},j=function(n,t){return W(n).indexOf(t)>-1},q=function(n,t){return 0==W(n).indexOf(t)},M=function(n){return W(n).replace(/^\s+|\s+$/g,"")},P=function(n){return W(n).split(",")},X=function(n){return W(n).split(" ")},V=function(n,t,e){var r=n.match(t);r&&e.apply(n,r)},$=function(n){return W(n).toLowerCase()},F=function(n){return encodeURIComponent(n)},K=function(n){return decodeURIComponent(n)},J=function(n,t){return typeof n==t},Q=function(n){return J(n,"number")},Y=function(n){return J(n,"string")},z=function(n){return J(n,"function")},Z=function(n,t){return n instanceof(t||Object)},nt=function(n){return Z(n,Array)};!function(){var t,e=n.D6=function(n){a(r,n),c||f()},r=e._VIEWS={},o=e._CACHE={},c=!1,f=function(){S("a","click",function(n,t){var e=d(n.href),r=t.which,o=!r||1==r;p(e)&&o&&(b(t),T(e,0,n))}),S("a","mouseover",function(n){if(!R(n,"_NOPREFETCH")){var t=d(n.href),e=t!=d(location);e&&p(t)&&_(t)}}),S("input,select,textarea","change",function(n){var t=n.form;t&&(t._LAST_CHANGED=getTime())}),S("input,button","click",function(n){if("submit"==n.type){var t=n.form;t&&t._CLICKED_BUTTON!=n&&(t._CLICKED_BUTTON=n,t._LAST_CHANGED=getTime())}}),S("form","submit",function(n,t){var e=d(n.action||location.href.replace(/\?.*$/,"")),r="get"==$(n.method);if(p(e)){b(t);var o=[];I(n,"input,select,textarea,button",function(t){var e=t.name,r=t.type,i=G(t),c=!e;c=c||"radio"==r&&!i,c=c||"submit"==r&&t!=n._CLICKED_BUTTON,c||(Y(i)?l(o,F(e)+"="+F(i)):u(i,function(n){l(o,F(e)+"="+F(n))}))}),r?(e+=(j(e,"?")?"&":"?")+o.join("&"),o=0):(e=m(e,n._LAST_CHANGED),o=o.join("&")),T(e,o,n)}});w(function(){T(location)}),c=!0},p=function(n){return q(n,location.protocol+"//"+location.host+"/")},d=function(n){return W(n).replace(/#.*$/,"")},m=function(n,t){return n+(j(n,"?")?"&":"?")+"d6="+(t||1)},g=function(n){return W(n).replace(/[&\?]d6=[r\d]+/g,"")},_=function(n){o[n]||(B('[D6] Prefetching "'+n+'".'),o[n]=[function(t){B('[D6] Caching contents for prefetched URL "'+n+'".'),o[n]=t;var e=t.ttl||1e4;setTimeout(function(){nt(o[n])||(B('[D6] Removing "'+n+'" from prefetch cache.'),delete o[n])},e)}],E(n))},T=e._LOAD_URL=function(n,t,r){e._LOADING_URL=g(n),e._LOAD_STARTED=getTime();var i=getData(r,"_D6_TARGET"),u=getData(r,"_D6_VIEW");i&&I(i,function(n){A(n,"_D6_TARGET")}),B('[D6] Loading "'+n+'".'),I("._SPINNER",function(n){A(n,"_LOADING")});var c=function(n,t){h(n,t,i,u)},a=o[n];a?nt(a)?(B('[D6] Queueing callback for "'+n+'".'),l(a,c)):(B('[D6] Found precached response for "'+n+'".'),c(a,n)):(B('[D6] Creating callback queue for "'+n+'".'),o[n]=[c],E(n,t))},E=function(n,t){B('[D6] Fetching response for "'+n+'".');var e=m(n),r=function(t){var e=o[n];o[n]=t,B("[D6] Running "+e.length+' callback(s) for "'+n+'".'),u(e,function(e){e(t,n)})};i(e,t,r,r,1)},h=function(t,i,u,c){e._CONTEXT=t;var a,f=(t._ERROR,g(t.d6u||i)),s=c||t.d6||"error0",l=e._VIEW=r[s];i=g(i),i==e._LOADING_URL&&(I("._SPINNER,._D6_TARGET",function(n){L(n,"_LOADING")}),"<"==M(t)[0]?(a=t,B("[D6] Rendering HTML string")):l?(a=l.call(r,t),B('[D6] Rendering view "'+s+'".')):(x('[D6] View "'+s+'" not found. Changing location.'),n.location=f)),a&&(D(a,u),U(f),delete o[i])},D=function(n,t){V(n,/<title.*?>([\s\S]+)<\/title>/,function(n,t){document.title=t});var e=[];n=n.replace(/<script.*?>([\s\S]*?)<\/script>/g,function(n,t){return t&&(e.push(t),n=""),n}),t?(I(t,function(t){N(t,n)}),u(e,execute),I(t,function(n){onReady(n)})):(V(n,/<body.*?>([\s\S]+)<\/body>/,function(n,t){N(body,t),body.scrollTop=0}),u(e,execute),onReady(document))},C=v("script");u(C,function(n){var e=W(n.src).split("?");s(e)&&(t=e[1])}),y("/d6.js?"+t)}()}(window);

package.json

@@ -7,3 +7,3 @@ {
   ],
-  "version": "0.0.10",
+  "version": "0.1.0",
   "main": "d6.js",
@@ -31,3 +31,3 @@ "homepage": "http://lighter.io/d6",
   "dependencies": {
-    "jymin": "0.2.8"
+    "jymin": "0.2.9"
   },
@@ -34,0 +34,0 @@ "devDependencies": {

scripts/d6-jymin.js

@@ -26,4 +26,2 @@ /**
 
-  var body;
-
   /**
@@ -34,6 +32,4 @@ * Initialization binds event handlers.
 
-    body = document.body;
-
     // When a same-domain link is clicked, fetch it via XMLHttpRequest.
-    on(body, 'a', 'click', function (a, event) {
+    on('a', 'click', function (a, event) {
       var url = removeHash(a.href);
@@ -44,3 +40,3 @@ var buttonNumber = event.which;
         preventDefault(event);
-        loadUrl(url);
+        loadUrl(url, 0, a);
       }
@@ -51,3 +47,3 @@ });
     // TODO: Use mouse movement to detect probably targets.
-    on(body, 'a', 'mouseover', function (a, event) {
+    on('a', 'mouseover', function (a, event) {
       if (!hasClass(a, '_NOPREFETCH')) {
@@ -63,3 +59,3 @@ var url = removeHash(a.href);
     // When a form field changes, timestamp the form.
-    var inputChanged = function (input) {
+    on('input,select,textarea', 'change', function (input) {
       var form = input.form;
@@ -69,9 +65,6 @@ if (form) {
       }
-    };
-    on(body, 'input', 'change', inputChanged);
-    on(body, 'select', 'change', inputChanged);
-    on(body, 'textarea', 'change', inputChanged);
+    });
 
     // When a form button is clicked, attach it to the form.
-    var buttonClicked = function (button) {
+    on('input,button', 'click', function (button) {
       if (button.type == 'submit') {
@@ -86,9 +79,7 @@ var form = button.form;
       }
-    };
-    on(body, 'input', 'click', buttonClicked);
-    on(body, 'button', 'click', buttonClicked);
+    });
 
     // When a form is submitted, gather its data and submit via XMLHttpRequest.
-    on(body, 'form', 'submit', function (form, event) {
-      var url = removeHash(form.action);
+    on('form', 'submit', function (form, event) {
+      var url = removeHash(form.action || location.href.replace(/\?.*$/, ''));
       var isGet = (lower(form.method) == 'get');
@@ -131,3 +122,3 @@ if (isSameDomain(url)) {
         // Submit form data to the URL.
-        loadUrl(url, data);
+        loadUrl(url, data, form);
       }
@@ -197,6 +188,14 @@ });
    */
-  var loadUrl = D6._LOAD_URL = function (url, data) {
+  var loadUrl = D6._LOAD_URL = function (url, data, sourceElement) {
     D6._LOADING_URL = removeD6Param(url);
     D6._LOAD_STARTED = getTime();
 
+    var targetSelector = getData(sourceElement, '_D6_TARGET');
+    var targetView = getData(sourceElement, '_D6_VIEW');
+    if (targetSelector) {
+      all(targetSelector, function (element) {
+        addClass(element, '_D6_TARGET');
+      });
+    }
+
     //+env:debug
@@ -211,2 +210,6 @@ log('[D6] Loading "' + url + '".');
 
+    var handler = function (context, url) {
+      renderResponse(context, url, targetSelector, targetView);
+    };
+
     // A resource is either a cached response, a callback queue, or nothing.
@@ -220,3 +223,3 @@ var resource = cache[url];
       //-env:debug
-      cache[url] = [renderResponse];
+      cache[url] = [handler];
       getD6Json(url, data);
@@ -229,3 +232,3 @@ }
       //-env:debug
-      push(resource, renderResponse);
+      push(resource, handler);
     }
@@ -237,3 +240,3 @@ // If the resource exists and isn't an array, render it.
       //-env:debug
-      renderResponse(resource, url);
+      handler(resource, url);
     }
@@ -270,7 +273,7 @@ };
   // Render a template with the given context, and display the resulting HTML.
-  var renderResponse = function (context, requestUrl) {
+  var renderResponse = function (context, requestUrl, targetSelector, targetView) {
     D6._CONTEXT = context;
     var err = context._ERROR;
     var responseUrl = removeD6Param(context.d6u || requestUrl);
-    var viewName = context.d6 || 'error0';
+    var viewName = targetView || context.d6 || 'error0';
     var view = D6._VIEW = views[viewName];
@@ -284,3 +287,3 @@ var html;
       // Reset any spinners.
-      all('._SPINNER', function (spinner) {
+      all('._SPINNER,._D6_TARGET', function (spinner) {
         removeClass(spinner, '_LOADING');
@@ -316,3 +319,3 @@ });
     if (html) {
-      writeHtml(html);
+      writeHtml(html, targetSelector);
 
@@ -330,3 +333,3 @@ // Change the location bar to reflect where we are now.
    */
-  var writeHtml = function (html) {
+  var writeHtml = function (html, targetSelector) {
     match(html, /<title.*?>([\s\S]+)<\/title>/, function (tag, title) {
@@ -343,8 +346,21 @@ document.title = title;
     });
-    match(html, /<body.*?>([\s\S]+)<\/body>/, function (tag, html) {
-      setHtml(body, html);
-      body.scrollTop = 0;
-    });
-    scripts.forEach(execute);
-    onReady();
+    // If we're just replacing the HTML of a target element, do so.
+    if (targetSelector) {
+      all(targetSelector, function (element) {
+        setHtml(element, html);
+      });
+      forEach(scripts, execute);
+      all(targetSelector, function (element) {
+        onReady(element);
+      });
+    }
+    // Otherwise, grab the body content, and mimic a page transition.
+    else {
+      match(html, /<body.*?>([\s\S]+)<\/body>/, function (tag, html) {
+        setHtml(body, html);
+        body.scrollTop = 0;
+      });
+      forEach(scripts, execute);
+      onReady(document);
+    }
   };
@@ -363,4 +379,5 @@
   });
+
   insertScript('/d6.js?' + cacheBust);
 
 })();

No alert changes

Improved metrics

Total package byte prevSize

71996

increased by2.03%

Lines of code

2175

increased by1.49%

Dependency changes

• + Addedjymin@0.2.9(transitive)

• - Removedjymin@0.2.8(transitive)

• Updatedjymin@0.2.9