diff --git a/bower.json b/bower.json index 6fd0c2a..6d06577 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "ko-component-router", "main": "ko-component-router.js", - "version": "2.1.1", + "version": "2.1.2", "homepage": "https://github.com/caseyWebb/ko-component-router", "repository": { "type": "git", diff --git a/dist/ko-component-router.js b/dist/ko-component-router.js index e298e60..fa67369 100644 --- a/dist/ko-component-router.js +++ b/dist/ko-component-router.js @@ -6,7 +6,7 @@ else if(typeof exports === 'object') exports["ko-component-router"] = factory(require("knockout")); else - root["ko-component-router"] = factory(root["knockout"]); + root["ko-component-router"] = factory(root["ko"]); })(this, function(__WEBPACK_EXTERNAL_MODULE_1__) { return /******/ (function(modules) { // webpackBootstrap /******/ // The module cache diff --git a/dist/ko-component-router.min.js b/dist/ko-component-router.min.js index 7f2c0fa..0bd4d04 100644 --- a/dist/ko-component-router.min.js +++ b/dist/ko-component-router.min.js @@ -1 +1 @@ -(function webpackUniversalModuleDefinition(root,factory){if(typeof exports==="object"&&typeof module==="object")module.exports=factory(require("knockout"));else if(typeof define==="function"&&define.amd)define(["knockout"],factory);else if(typeof exports==="object")exports["ko-component-router"]=factory(require("knockout"));else root["ko-component-router"]=factory(root["knockout"])})(this,function(__WEBPACK_EXTERNAL_MODULE_1__){return function(modules){var installedModules={};function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:false};modules[moduleId].call(module.exports,module,module.exports,__webpack_require__);module.loaded=true;return module.exports}__webpack_require__.m=modules;__webpack_require__.c=installedModules;__webpack_require__.p="";return __webpack_require__(0)}([function(module,exports,__webpack_require__){"use strict";var ko=__webpack_require__(1);ko.router=__webpack_require__(2)},function(module,exports){module.exports=__WEBPACK_EXTERNAL_MODULE_1__},function(module,exports,__webpack_require__){"use strict";var ko=__webpack_require__(1);var page=__webpack_require__(3);function Router(){this._component=ko.observable();this._ctx=ko.observable()}Router.prototype.start=function(config){if(typeof config==="undefined")config={};this._basePath=config.basePath||"";page.base(this._basePath);page.start(config);__webpack_require__(7);__webpack_require__(8)};Router.prototype.show=function(path){page.show(path)};Router.prototype.redirect=function(path){page.redirect(path)};Router.prototype.route=function(route){var self=this;var stack=[];var args,arg,i,el;for(i=1;i0){history.back();page.len--}else if(path){setTimeout(function(){page.show(path,state)})}else{setTimeout(function(){page.show(base,state)})}};page.redirect=function(from,to){if("string"===typeof from&&"string"===typeof to){page(from,function(e){setTimeout(function(){page.replace(to)},0)})}if("string"===typeof from&&"undefined"===typeof to){setTimeout(function(){page.replace(from)},0)}};page.replace=function(path,state,init,dispatch){var ctx=new Context(path,state);page.current=ctx.path;ctx.init=init;ctx.save();if(false!==dispatch)page.dispatch(ctx);return ctx};page.dispatch=function(ctx){var prev=prevContext,i=0,j=0;prevContext=ctx;function nextExit(){var fn=page.exits[j++];if(!fn)return nextEnter();fn(prev,nextExit)}function nextEnter(){var fn=page.callbacks[i++];if(ctx.path!==page.current){ctx.handled=false;return}if(!fn)return unhandled(ctx);fn(ctx,nextEnter)}if(prev){nextExit()}else{nextEnter()}};function unhandled(ctx){if(ctx.handled)return;var current;if(hashbang){current=base+location.hash.replace("#!","")}else{current=location.pathname+location.search}if(current===ctx.canonicalPath)return;page.stop();ctx.handled=false;location.href=ctx.canonicalPath}page.exit=function(path,fn){if(typeof path==="function"){return page.exit("*",path)}var route=new Route(path);for(var i=1;i-1)return;if(el.target)return;if(!sameOrigin(el.href))return;var path=el.pathname+el.search+(el.hash||"");if(typeof process!=="undefined"&&path.match(/^\/[a-zA-Z]:\//)){path=path.replace(/^\/[a-zA-Z]:\//,"/")}var orig=path;if(path.indexOf(base)===0){path=path.substr(base.length)}if(hashbang)path=path.replace("#!","");if(base&&orig===path)return;e.preventDefault();page.show(orig)}function which(e){e=e||window.event;return null===e.which?e.button:e.which}function sameOrigin(href){var origin=location.protocol+"//"+location.hostname;if(location.port)origin+=":"+location.port;return href&&0===href.indexOf(origin)}page.sameOrigin=sameOrigin}).call(exports,__webpack_require__(4))},function(module,exports){var process=module.exports={};var queue=[];var draining=false;var currentQueue;var queueIndex=-1;function cleanUpNextTick(){draining=false;if(currentQueue.length){queue=currentQueue.concat(queue)}else{queueIndex=-1}if(queue.length){drainQueue()}}function drainQueue(){if(draining){return}var timeout=setTimeout(cleanUpNextTick);draining=true;var len=queue.length;while(len){currentQueue=queue;queue=[];while(++queueIndex1){for(var i=1;i"+"
"+""});module.exports=ViewModel}])}); \ No newline at end of file +(function webpackUniversalModuleDefinition(root,factory){if(typeof exports==="object"&&typeof module==="object")module.exports=factory(require("knockout"));else if(typeof define==="function"&&define.amd)define(["knockout"],factory);else if(typeof exports==="object")exports["ko-component-router"]=factory(require("knockout"));else root["ko-component-router"]=factory(root["ko"])})(this,function(__WEBPACK_EXTERNAL_MODULE_1__){return function(modules){var installedModules={};function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:false};modules[moduleId].call(module.exports,module,module.exports,__webpack_require__);module.loaded=true;return module.exports}__webpack_require__.m=modules;__webpack_require__.c=installedModules;__webpack_require__.p="";return __webpack_require__(0)}([function(module,exports,__webpack_require__){"use strict";var ko=__webpack_require__(1);ko.router=__webpack_require__(2)},function(module,exports){module.exports=__WEBPACK_EXTERNAL_MODULE_1__},function(module,exports,__webpack_require__){"use strict";var ko=__webpack_require__(1);var page=__webpack_require__(3);function Router(){this._component=ko.observable();this._ctx=ko.observable()}Router.prototype.start=function(config){if(typeof config==="undefined")config={};this._basePath=config.basePath||"";page.base(this._basePath);page.start(config);__webpack_require__(7);__webpack_require__(8)};Router.prototype.show=function(path){page.show(path)};Router.prototype.redirect=function(path){page.redirect(path)};Router.prototype.route=function(route){var self=this;var stack=[];var args,arg,i,el;for(i=1;i0){history.back();page.len--}else if(path){setTimeout(function(){page.show(path,state)})}else{setTimeout(function(){page.show(base,state)})}};page.redirect=function(from,to){if("string"===typeof from&&"string"===typeof to){page(from,function(e){setTimeout(function(){page.replace(to)},0)})}if("string"===typeof from&&"undefined"===typeof to){setTimeout(function(){page.replace(from)},0)}};page.replace=function(path,state,init,dispatch){var ctx=new Context(path,state);page.current=ctx.path;ctx.init=init;ctx.save();if(false!==dispatch)page.dispatch(ctx);return ctx};page.dispatch=function(ctx){var prev=prevContext,i=0,j=0;prevContext=ctx;function nextExit(){var fn=page.exits[j++];if(!fn)return nextEnter();fn(prev,nextExit)}function nextEnter(){var fn=page.callbacks[i++];if(ctx.path!==page.current){ctx.handled=false;return}if(!fn)return unhandled(ctx);fn(ctx,nextEnter)}if(prev){nextExit()}else{nextEnter()}};function unhandled(ctx){if(ctx.handled)return;var current;if(hashbang){current=base+location.hash.replace("#!","")}else{current=location.pathname+location.search}if(current===ctx.canonicalPath)return;page.stop();ctx.handled=false;location.href=ctx.canonicalPath}page.exit=function(path,fn){if(typeof path==="function"){return page.exit("*",path)}var route=new Route(path);for(var i=1;i-1)return;if(el.target)return;if(!sameOrigin(el.href))return;var path=el.pathname+el.search+(el.hash||"");if(typeof process!=="undefined"&&path.match(/^\/[a-zA-Z]:\//)){path=path.replace(/^\/[a-zA-Z]:\//,"/")}var orig=path;if(path.indexOf(base)===0){path=path.substr(base.length)}if(hashbang)path=path.replace("#!","");if(base&&orig===path)return;e.preventDefault();page.show(orig)}function which(e){e=e||window.event;return null===e.which?e.button:e.which}function sameOrigin(href){var origin=location.protocol+"//"+location.hostname;if(location.port)origin+=":"+location.port;return href&&0===href.indexOf(origin)}page.sameOrigin=sameOrigin}).call(exports,__webpack_require__(4))},function(module,exports){var process=module.exports={};var queue=[];var draining=false;var currentQueue;var queueIndex=-1;function cleanUpNextTick(){draining=false;if(currentQueue.length){queue=currentQueue.concat(queue)}else{queueIndex=-1}if(queue.length){drainQueue()}}function drainQueue(){if(draining){return}var timeout=setTimeout(cleanUpNextTick);draining=true;var len=queue.length;while(len){currentQueue=queue;queue=[];while(++queueIndex1){for(var i=1;i"+"
"+""});module.exports=ViewModel}])}); \ No newline at end of file diff --git a/package.json b/package.json index f2572b6..23675f4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ko-component-router", - "version": "2.1.1", + "version": "2.1.2", "description": "Component-based routing for KnockoutJS", "homepage": "https://github.com/caseyWebb/ko-component-router", "bugs": { diff --git a/webpack.config.js b/webpack.config.js index 114965b..e8ae523 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -9,6 +9,11 @@ module.exports = { }, externals: { - 'knockout': 'knockout' + 'knockout': { + root: 'ko', + commonjs: 'knockout', + commonjs2: 'knockout', + amd: 'knockout' + } } }