From 4297efeae2e56f23290f8ac0ad9fb7b252bf2e0d Mon Sep 17 00:00:00 2001 From: Benjamin Lupton Date: Sat, 27 Jul 2013 04:59:30 -0400 Subject: [PATCH 1/7] moved files for docpad directory structure --- license.txt => LICENSE.md | 0 package.json | 51 +++++-------------- {demo => src/render/demo}/bcherry-orig.html | 0 {demo => src/render/demo}/bcherry.html | 0 {demo => src/render/demo}/chrome.html | 0 {demo => src/render/demo}/index.html | 0 {demo => src/render/demo}/native-auto.html | 0 {demo => src/render/demo}/native.html | 0 {demo => src/render/demo}/navigator.html | 0 {demo => src/render/demo}/safari.html | 0 {demo => src/render/demo}/unicode.html | 0 .../static/lib}/history.adapter.dojo.js | 4 +- .../static/lib}/history.adapter.extjs.js | 0 .../static/lib}/history.adapter.jquery.js | 4 +- .../static/lib}/history.adapter.mootools.js | 4 +- .../static/lib}/history.adapter.native.js | 4 +- .../static/lib}/history.adapter.right.js | 4 +- .../static/lib}/history.adapter.zepto.js | 4 +- .../static/lib}/history.html4.js | 14 ++--- .../static/lib}/history.js | 14 ++--- .../uncompressed => src/static/lib}/json2.js | 0 .../static/tests.src}/_header.php | 0 {tests.src => src/static/tests.src}/all.php | 0 {tests.src => src/static/tests.src}/each.php | 0 {tests.src => src/static/tests.src}/index.php | 0 {tests => src/static/tests}/.htaccess | 0 .../static/tests}/html4+html5.dojo.html | 0 .../static/tests}/html4+html5.extjs.html | 0 .../static/tests}/html4+html5.jquery.html | 0 .../static/tests}/html4+html5.mootools.html | 0 .../static/tests}/html4+html5.native.html | 0 .../static/tests}/html4+html5.right.html | 0 .../static/tests}/html4+html5.zepto.html | 0 {tests => src/static/tests}/html5.dojo.html | 0 {tests => src/static/tests}/html5.extjs.html | 0 {tests => src/static/tests}/html5.jquery.html | 0 .../static/tests}/html5.mootools.html | 0 {tests => src/static/tests}/html5.native.html | 0 {tests => src/static/tests}/html5.right.html | 0 {tests => src/static/tests}/html5.zepto.html | 0 {tests => src/static/tests}/image.php | 0 {tests => src/static/tests}/index.html | 0 {tests => src/static/tests}/tests.js | 0 {vendor => src/static/vendor}/dojo.js | 0 {vendor => src/static/vendor}/extjs.js | 0 {vendor => src/static/vendor}/jquery.js | 0 {vendor => src/static/vendor}/mootools.js | 0 .../static/vendor}/qunit/.gitignore | 0 .../static/vendor}/qunit/AUTHORS.txt | 0 .../static/vendor}/qunit/History.md | 0 {vendor => src/static/vendor}/qunit/README.md | 0 {vendor => src/static/vendor}/qunit/grunt.js | 0 .../static/vendor}/qunit/package.json | 0 .../static/vendor}/qunit/qunit/.jshintrc | 0 .../static/vendor}/qunit/qunit/qunit.css | 0 .../static/vendor}/qunit/qunit/qunit.js | 0 .../static/vendor}/qunit/test/.jshintrc | 0 .../static/vendor}/qunit/test/async.html | 0 .../static/vendor}/qunit/test/async.js | 0 .../static/vendor}/qunit/test/deepEqual.js | 0 .../static/vendor}/qunit/test/headless.html | 0 .../static/vendor}/qunit/test/index.html | 0 .../static/vendor}/qunit/test/logs.html | 0 .../static/vendor}/qunit/test/logs.js | 0 .../static/vendor}/qunit/test/narwhal-test.js | 0 .../static/vendor}/qunit/test/node-test.js | 0 .../static/vendor}/qunit/test/same.js | 0 .../static/vendor}/qunit/test/swarminject.js | 0 .../static/vendor}/qunit/test/test.js | 0 {vendor => src/static/vendor}/right.js | 0 {vendor => src/static/vendor}/zepto.js | 0 71 files changed, 39 insertions(+), 64 deletions(-) rename license.txt => LICENSE.md (100%) rename {demo => src/render/demo}/bcherry-orig.html (100%) rename {demo => src/render/demo}/bcherry.html (100%) rename {demo => src/render/demo}/chrome.html (100%) rename {demo => src/render/demo}/index.html (100%) rename {demo => src/render/demo}/native-auto.html (100%) rename {demo => src/render/demo}/native.html (100%) rename {demo => src/render/demo}/navigator.html (100%) rename {demo => src/render/demo}/safari.html (100%) rename {demo => src/render/demo}/unicode.html (100%) rename {scripts/uncompressed => src/static/lib}/history.adapter.dojo.js (95%) rename {scripts/uncompressed => src/static/lib}/history.adapter.extjs.js (100%) rename {scripts/uncompressed => src/static/lib}/history.adapter.jquery.js (93%) rename {scripts/uncompressed => src/static/lib}/history.adapter.mootools.js (94%) rename {scripts/uncompressed => src/static/lib}/history.adapter.native.js (95%) rename {scripts/uncompressed => src/static/lib}/history.adapter.right.js (93%) rename {scripts/uncompressed => src/static/lib}/history.adapter.zepto.js (92%) rename {scripts/uncompressed => src/static/lib}/history.html4.js (99%) rename {scripts/uncompressed => src/static/lib}/history.js (99%) rename {scripts/uncompressed => src/static/lib}/json2.js (100%) rename {tests.src => src/static/tests.src}/_header.php (100%) rename {tests.src => src/static/tests.src}/all.php (100%) rename {tests.src => src/static/tests.src}/each.php (100%) rename {tests.src => src/static/tests.src}/index.php (100%) rename {tests => src/static/tests}/.htaccess (100%) rename {tests => src/static/tests}/html4+html5.dojo.html (100%) rename {tests => src/static/tests}/html4+html5.extjs.html (100%) rename {tests => src/static/tests}/html4+html5.jquery.html (100%) rename {tests => src/static/tests}/html4+html5.mootools.html (100%) rename {tests => src/static/tests}/html4+html5.native.html (100%) rename {tests => src/static/tests}/html4+html5.right.html (100%) rename {tests => src/static/tests}/html4+html5.zepto.html (100%) rename {tests => src/static/tests}/html5.dojo.html (100%) rename {tests => src/static/tests}/html5.extjs.html (100%) rename {tests => src/static/tests}/html5.jquery.html (100%) rename {tests => src/static/tests}/html5.mootools.html (100%) rename {tests => src/static/tests}/html5.native.html (100%) rename {tests => src/static/tests}/html5.right.html (100%) rename {tests => src/static/tests}/html5.zepto.html (100%) rename {tests => src/static/tests}/image.php (100%) rename {tests => src/static/tests}/index.html (100%) rename {tests => src/static/tests}/tests.js (100%) rename {vendor => src/static/vendor}/dojo.js (100%) rename {vendor => src/static/vendor}/extjs.js (100%) rename {vendor => src/static/vendor}/jquery.js (100%) rename {vendor => src/static/vendor}/mootools.js (100%) rename {vendor => src/static/vendor}/qunit/.gitignore (100%) rename {vendor => src/static/vendor}/qunit/AUTHORS.txt (100%) rename {vendor => src/static/vendor}/qunit/History.md (100%) rename {vendor => src/static/vendor}/qunit/README.md (100%) rename {vendor => src/static/vendor}/qunit/grunt.js (100%) rename {vendor => src/static/vendor}/qunit/package.json (100%) rename {vendor => src/static/vendor}/qunit/qunit/.jshintrc (100%) rename {vendor => src/static/vendor}/qunit/qunit/qunit.css (100%) rename {vendor => src/static/vendor}/qunit/qunit/qunit.js (100%) rename {vendor => src/static/vendor}/qunit/test/.jshintrc (100%) rename {vendor => src/static/vendor}/qunit/test/async.html (100%) rename {vendor => src/static/vendor}/qunit/test/async.js (100%) rename {vendor => src/static/vendor}/qunit/test/deepEqual.js (100%) rename {vendor => src/static/vendor}/qunit/test/headless.html (100%) rename {vendor => src/static/vendor}/qunit/test/index.html (100%) rename {vendor => src/static/vendor}/qunit/test/logs.html (100%) rename {vendor => src/static/vendor}/qunit/test/logs.js (100%) rename {vendor => src/static/vendor}/qunit/test/narwhal-test.js (100%) rename {vendor => src/static/vendor}/qunit/test/node-test.js (100%) rename {vendor => src/static/vendor}/qunit/test/same.js (100%) rename {vendor => src/static/vendor}/qunit/test/swarminject.js (100%) rename {vendor => src/static/vendor}/qunit/test/test.js (100%) rename {vendor => src/static/vendor}/right.js (100%) rename {vendor => src/static/vendor}/zepto.js (100%) diff --git a/license.txt b/LICENSE.md similarity index 100% rename from license.txt rename to LICENSE.md diff --git a/package.json b/package.json index cc6f23d0..0d30fecd 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "history.js", "version": "1.8.0", "description": "History.js gracefully supports the HTML5 History/State APIs (pushState, replaceState, onPopState) in all browsers. Including continued support for data, titles, replaceState. Supports jQuery, MooTools and Prototype. For HTML5 browsers this means that you can modify the URL directly, without needing to use hashes anymore. For HTML4 browsers it will revert back to using the old onhashchange functionality.", - "homepage": "https://github.com/browserstate/history.js", + "homepage": "https://historyjs.net", "keywords": [ "javascript", "html5 history api", @@ -13,55 +13,30 @@ "hashes", "hashbang" ], - "author": { - "name": "Benjamin Lupton", - "email": "b@lupton.cc", - "web": "http://balupton.com" - }, + "author": "Benjamin Lupton (http://balupton.com)", "maintainers": [ - { - "name": "Benjamin Lupton", - "email": "b@lupton.cc", - "web": "http://balupton.com" - }, - { - "name": "Andreas Bernhard", - "email": "andreas@bernhard.im", - "web": "http://www.bs-infosys.com" - } + "Benjamin Lupton (https://github.com/balupton)", + "Andreas Bernhard (http://www.bs-infosys.com)" ], "contributors": [ - { - "name": "Benjamin Lupton", - "email": "b@lupton.cc", - "web": "http://balupton.com" - }, - { - "name": "Andreas Bernhard", - "email": "andreas@bernhard.im", - "web": "http://www.bs-infosys.com" - } + "Benjamin Lupton (https://github.com/balupton)", + "Andreas Bernhard (http://www.bs-infosys.com)" ], "bugs": { - "web": "https://github.com/browserstate/history.js/issues" + "url": "https://github.com/browserstate/history.js/issues" }, + "repository": { + "type": "git", + "url": "http://github.com/browserstate/history.js.git" + }, + "engines": {}, "licenses": [ { "type": "New-BSD", "url": "http://creativecommons.org/licenses/BSD/" } ], - "repository": { - "type": "git", - "url": "http://github.com/browserstate/history.js.git" - }, "dependencies": { - "buildr": "0.8.x" - }, - "engines": { - }, - "directories": { - "out": "./scripts/compressed", - "src": "./scripts/uncompressed" + "docpad": "~6.46.4" } } \ No newline at end of file diff --git a/demo/bcherry-orig.html b/src/render/demo/bcherry-orig.html similarity index 100% rename from demo/bcherry-orig.html rename to src/render/demo/bcherry-orig.html diff --git a/demo/bcherry.html b/src/render/demo/bcherry.html similarity index 100% rename from demo/bcherry.html rename to src/render/demo/bcherry.html diff --git a/demo/chrome.html b/src/render/demo/chrome.html similarity index 100% rename from demo/chrome.html rename to src/render/demo/chrome.html diff --git a/demo/index.html b/src/render/demo/index.html similarity index 100% rename from demo/index.html rename to src/render/demo/index.html diff --git a/demo/native-auto.html b/src/render/demo/native-auto.html similarity index 100% rename from demo/native-auto.html rename to src/render/demo/native-auto.html diff --git a/demo/native.html b/src/render/demo/native.html similarity index 100% rename from demo/native.html rename to src/render/demo/native.html diff --git a/demo/navigator.html b/src/render/demo/navigator.html similarity index 100% rename from demo/navigator.html rename to src/render/demo/navigator.html diff --git a/demo/safari.html b/src/render/demo/safari.html similarity index 100% rename from demo/safari.html rename to src/render/demo/safari.html diff --git a/demo/unicode.html b/src/render/demo/unicode.html similarity index 100% rename from demo/unicode.html rename to src/render/demo/unicode.html diff --git a/scripts/uncompressed/history.adapter.dojo.js b/src/static/lib/history.adapter.dojo.js similarity index 95% rename from scripts/uncompressed/history.adapter.dojo.js rename to src/static/lib/history.adapter.dojo.js index 62946d78..6c340bee 100644 --- a/scripts/uncompressed/history.adapter.dojo.js +++ b/src/static/lib/history.adapter.dojo.js @@ -3,8 +3,8 @@ * * Essentially the same as the native adapter but uses dojo/ready for the dom load callback. * - * @author Benjamin Arthur Lupton - * @copyright 2010-2011 Benjamin Arthur Lupton + * @author Benjamin Arthur Lupton + * @copyright 2010+ Benjamin Arthur Lupton * @license New BSD License */ diff --git a/scripts/uncompressed/history.adapter.extjs.js b/src/static/lib/history.adapter.extjs.js similarity index 100% rename from scripts/uncompressed/history.adapter.extjs.js rename to src/static/lib/history.adapter.extjs.js diff --git a/scripts/uncompressed/history.adapter.jquery.js b/src/static/lib/history.adapter.jquery.js similarity index 93% rename from scripts/uncompressed/history.adapter.jquery.js rename to src/static/lib/history.adapter.jquery.js index 8c252d5b..d92d0fdd 100644 --- a/scripts/uncompressed/history.adapter.jquery.js +++ b/src/static/lib/history.adapter.jquery.js @@ -1,7 +1,7 @@ /** * History.js jQuery Adapter - * @author Benjamin Arthur Lupton - * @copyright 2010-2011 Benjamin Arthur Lupton + * @author Benjamin Arthur Lupton + * @copyright 2010+ Benjamin Arthur Lupton * @license New BSD License */ diff --git a/scripts/uncompressed/history.adapter.mootools.js b/src/static/lib/history.adapter.mootools.js similarity index 94% rename from scripts/uncompressed/history.adapter.mootools.js rename to src/static/lib/history.adapter.mootools.js index 404425c4..86f042b7 100644 --- a/scripts/uncompressed/history.adapter.mootools.js +++ b/src/static/lib/history.adapter.mootools.js @@ -1,7 +1,7 @@ /** * History.js MooTools Adapter - * @author Benjamin Arthur Lupton - * @copyright 2010-2011 Benjamin Arthur Lupton + * @author Benjamin Arthur Lupton + * @copyright 2010+ Benjamin Arthur Lupton * @license New BSD License */ diff --git a/scripts/uncompressed/history.adapter.native.js b/src/static/lib/history.adapter.native.js similarity index 95% rename from scripts/uncompressed/history.adapter.native.js rename to src/static/lib/history.adapter.native.js index cb42fbd6..3cd2dd5e 100644 --- a/scripts/uncompressed/history.adapter.native.js +++ b/src/static/lib/history.adapter.native.js @@ -1,7 +1,7 @@ /** * History.js Native Adapter - * @author Benjamin Arthur Lupton - * @copyright 2010-2011 Benjamin Arthur Lupton + * @author Benjamin Arthur Lupton + * @copyright 2010+ Benjamin Arthur Lupton * @license New BSD License */ diff --git a/scripts/uncompressed/history.adapter.right.js b/src/static/lib/history.adapter.right.js similarity index 93% rename from scripts/uncompressed/history.adapter.right.js rename to src/static/lib/history.adapter.right.js index 20903e20..eecf58a8 100644 --- a/scripts/uncompressed/history.adapter.right.js +++ b/src/static/lib/history.adapter.right.js @@ -1,7 +1,7 @@ /** * History.js RightJS Adapter - * @author Benjamin Arthur Lupton - * @copyright 2010-2011 Benjamin Arthur Lupton + * @author Benjamin Arthur Lupton + * @copyright 2010+ Benjamin Arthur Lupton * @license New BSD License */ diff --git a/scripts/uncompressed/history.adapter.zepto.js b/src/static/lib/history.adapter.zepto.js similarity index 92% rename from scripts/uncompressed/history.adapter.zepto.js rename to src/static/lib/history.adapter.zepto.js index f1295f9d..d8b0a131 100644 --- a/scripts/uncompressed/history.adapter.zepto.js +++ b/src/static/lib/history.adapter.zepto.js @@ -1,7 +1,7 @@ /** * History.js Zepto Adapter - * @author Benjamin Arthur Lupton - * @copyright 2010-2011 Benjamin Arthur Lupton + * @author Benjamin Arthur Lupton + * @copyright 2010+ Benjamin Arthur Lupton * @license New BSD License */ diff --git a/scripts/uncompressed/history.html4.js b/src/static/lib/history.html4.js similarity index 99% rename from scripts/uncompressed/history.html4.js rename to src/static/lib/history.html4.js index 610c8ee6..9aab9a63 100644 --- a/scripts/uncompressed/history.html4.js +++ b/src/static/lib/history.html4.js @@ -1,8 +1,8 @@ /** * History.js HTML4 Support * Depends on the HTML5 Support - * @author Benjamin Arthur Lupton - * @copyright 2010-2011 Benjamin Arthur Lupton + * @author Benjamin Arthur Lupton + * @copyright 2010+ Benjamin Arthur Lupton * @license New BSD License */ @@ -351,7 +351,7 @@ // Equalise lastIframeHash = iframeHash; - + // If there is no iframe hash that means we're at the original // iframe state. // And if there was a hash on the original request, the original @@ -569,7 +569,7 @@ if ( !History.isHashEqual(newStateHash, html4Hash) && !History.isHashEqual(newStateHash, History.getShortUrl(History.getLocationHref())) ) { History.setHash(newStateHash,false); } - + History.busy(false); // End pushState closure @@ -631,13 +631,13 @@ // Store the newState History.storeState(newState); History.expectedStateId = newState.id; - + // Recycle the State History.recycleState(newState); - + // Force update of the title History.setTitle(newState); - + // Update HTML5 State History.saveState(newState); diff --git a/scripts/uncompressed/history.js b/src/static/lib/history.js similarity index 99% rename from scripts/uncompressed/history.js rename to src/static/lib/history.js index 299e7721..7d4b8dfb 100644 --- a/scripts/uncompressed/history.js +++ b/src/static/lib/history.js @@ -1,7 +1,7 @@ /** * History.js Core - * @author Benjamin Arthur Lupton - * @copyright 2010-2011 Benjamin Arthur Lupton + * @author Benjamin Arthur Lupton + * @copyright 2010+ Benjamin Arthur Lupton * @license New BSD License */ @@ -589,7 +589,7 @@ if (doc.URL.indexOf('#') == -1 && doc.location.href.indexOf('#') != -1) return doc.location.href; - + return doc.URL || doc.location.href; }; @@ -900,7 +900,7 @@ var id,parts,url, tmp; // Extract - + // If the URL has a #, use the id from before the # if (url_or_hash.indexOf('#') != -1) { @@ -910,7 +910,7 @@ { tmp = url_or_hash; } - + parts = /(.*)\&_suid=([0-9]+)$/.exec(tmp); url = parts ? (parts[1]||url_or_hash) : url_or_hash; id = parts ? String(parts[2]||'') : ''; @@ -1110,7 +1110,7 @@ // Return State return State; }; - + /** * History.getCurrentIndex() * Gets the current index @@ -1119,7 +1119,7 @@ History.getCurrentIndex = function(){ // Prepare var index = null; - + // No states saved if(History.savedStates.length < 1) { index = 0; diff --git a/scripts/uncompressed/json2.js b/src/static/lib/json2.js similarity index 100% rename from scripts/uncompressed/json2.js rename to src/static/lib/json2.js diff --git a/tests.src/_header.php b/src/static/tests.src/_header.php similarity index 100% rename from tests.src/_header.php rename to src/static/tests.src/_header.php diff --git a/tests.src/all.php b/src/static/tests.src/all.php similarity index 100% rename from tests.src/all.php rename to src/static/tests.src/all.php diff --git a/tests.src/each.php b/src/static/tests.src/each.php similarity index 100% rename from tests.src/each.php rename to src/static/tests.src/each.php diff --git a/tests.src/index.php b/src/static/tests.src/index.php similarity index 100% rename from tests.src/index.php rename to src/static/tests.src/index.php diff --git a/tests/.htaccess b/src/static/tests/.htaccess similarity index 100% rename from tests/.htaccess rename to src/static/tests/.htaccess diff --git a/tests/html4+html5.dojo.html b/src/static/tests/html4+html5.dojo.html similarity index 100% rename from tests/html4+html5.dojo.html rename to src/static/tests/html4+html5.dojo.html diff --git a/tests/html4+html5.extjs.html b/src/static/tests/html4+html5.extjs.html similarity index 100% rename from tests/html4+html5.extjs.html rename to src/static/tests/html4+html5.extjs.html diff --git a/tests/html4+html5.jquery.html b/src/static/tests/html4+html5.jquery.html similarity index 100% rename from tests/html4+html5.jquery.html rename to src/static/tests/html4+html5.jquery.html diff --git a/tests/html4+html5.mootools.html b/src/static/tests/html4+html5.mootools.html similarity index 100% rename from tests/html4+html5.mootools.html rename to src/static/tests/html4+html5.mootools.html diff --git a/tests/html4+html5.native.html b/src/static/tests/html4+html5.native.html similarity index 100% rename from tests/html4+html5.native.html rename to src/static/tests/html4+html5.native.html diff --git a/tests/html4+html5.right.html b/src/static/tests/html4+html5.right.html similarity index 100% rename from tests/html4+html5.right.html rename to src/static/tests/html4+html5.right.html diff --git a/tests/html4+html5.zepto.html b/src/static/tests/html4+html5.zepto.html similarity index 100% rename from tests/html4+html5.zepto.html rename to src/static/tests/html4+html5.zepto.html diff --git a/tests/html5.dojo.html b/src/static/tests/html5.dojo.html similarity index 100% rename from tests/html5.dojo.html rename to src/static/tests/html5.dojo.html diff --git a/tests/html5.extjs.html b/src/static/tests/html5.extjs.html similarity index 100% rename from tests/html5.extjs.html rename to src/static/tests/html5.extjs.html diff --git a/tests/html5.jquery.html b/src/static/tests/html5.jquery.html similarity index 100% rename from tests/html5.jquery.html rename to src/static/tests/html5.jquery.html diff --git a/tests/html5.mootools.html b/src/static/tests/html5.mootools.html similarity index 100% rename from tests/html5.mootools.html rename to src/static/tests/html5.mootools.html diff --git a/tests/html5.native.html b/src/static/tests/html5.native.html similarity index 100% rename from tests/html5.native.html rename to src/static/tests/html5.native.html diff --git a/tests/html5.right.html b/src/static/tests/html5.right.html similarity index 100% rename from tests/html5.right.html rename to src/static/tests/html5.right.html diff --git a/tests/html5.zepto.html b/src/static/tests/html5.zepto.html similarity index 100% rename from tests/html5.zepto.html rename to src/static/tests/html5.zepto.html diff --git a/tests/image.php b/src/static/tests/image.php similarity index 100% rename from tests/image.php rename to src/static/tests/image.php diff --git a/tests/index.html b/src/static/tests/index.html similarity index 100% rename from tests/index.html rename to src/static/tests/index.html diff --git a/tests/tests.js b/src/static/tests/tests.js similarity index 100% rename from tests/tests.js rename to src/static/tests/tests.js diff --git a/vendor/dojo.js b/src/static/vendor/dojo.js similarity index 100% rename from vendor/dojo.js rename to src/static/vendor/dojo.js diff --git a/vendor/extjs.js b/src/static/vendor/extjs.js similarity index 100% rename from vendor/extjs.js rename to src/static/vendor/extjs.js diff --git a/vendor/jquery.js b/src/static/vendor/jquery.js similarity index 100% rename from vendor/jquery.js rename to src/static/vendor/jquery.js diff --git a/vendor/mootools.js b/src/static/vendor/mootools.js similarity index 100% rename from vendor/mootools.js rename to src/static/vendor/mootools.js diff --git a/vendor/qunit/.gitignore b/src/static/vendor/qunit/.gitignore similarity index 100% rename from vendor/qunit/.gitignore rename to src/static/vendor/qunit/.gitignore diff --git a/vendor/qunit/AUTHORS.txt b/src/static/vendor/qunit/AUTHORS.txt similarity index 100% rename from vendor/qunit/AUTHORS.txt rename to src/static/vendor/qunit/AUTHORS.txt diff --git a/vendor/qunit/History.md b/src/static/vendor/qunit/History.md similarity index 100% rename from vendor/qunit/History.md rename to src/static/vendor/qunit/History.md diff --git a/vendor/qunit/README.md b/src/static/vendor/qunit/README.md similarity index 100% rename from vendor/qunit/README.md rename to src/static/vendor/qunit/README.md diff --git a/vendor/qunit/grunt.js b/src/static/vendor/qunit/grunt.js similarity index 100% rename from vendor/qunit/grunt.js rename to src/static/vendor/qunit/grunt.js diff --git a/vendor/qunit/package.json b/src/static/vendor/qunit/package.json similarity index 100% rename from vendor/qunit/package.json rename to src/static/vendor/qunit/package.json diff --git a/vendor/qunit/qunit/.jshintrc b/src/static/vendor/qunit/qunit/.jshintrc similarity index 100% rename from vendor/qunit/qunit/.jshintrc rename to src/static/vendor/qunit/qunit/.jshintrc diff --git a/vendor/qunit/qunit/qunit.css b/src/static/vendor/qunit/qunit/qunit.css similarity index 100% rename from vendor/qunit/qunit/qunit.css rename to src/static/vendor/qunit/qunit/qunit.css diff --git a/vendor/qunit/qunit/qunit.js b/src/static/vendor/qunit/qunit/qunit.js similarity index 100% rename from vendor/qunit/qunit/qunit.js rename to src/static/vendor/qunit/qunit/qunit.js diff --git a/vendor/qunit/test/.jshintrc b/src/static/vendor/qunit/test/.jshintrc similarity index 100% rename from vendor/qunit/test/.jshintrc rename to src/static/vendor/qunit/test/.jshintrc diff --git a/vendor/qunit/test/async.html b/src/static/vendor/qunit/test/async.html similarity index 100% rename from vendor/qunit/test/async.html rename to src/static/vendor/qunit/test/async.html diff --git a/vendor/qunit/test/async.js b/src/static/vendor/qunit/test/async.js similarity index 100% rename from vendor/qunit/test/async.js rename to src/static/vendor/qunit/test/async.js diff --git a/vendor/qunit/test/deepEqual.js b/src/static/vendor/qunit/test/deepEqual.js similarity index 100% rename from vendor/qunit/test/deepEqual.js rename to src/static/vendor/qunit/test/deepEqual.js diff --git a/vendor/qunit/test/headless.html b/src/static/vendor/qunit/test/headless.html similarity index 100% rename from vendor/qunit/test/headless.html rename to src/static/vendor/qunit/test/headless.html diff --git a/vendor/qunit/test/index.html b/src/static/vendor/qunit/test/index.html similarity index 100% rename from vendor/qunit/test/index.html rename to src/static/vendor/qunit/test/index.html diff --git a/vendor/qunit/test/logs.html b/src/static/vendor/qunit/test/logs.html similarity index 100% rename from vendor/qunit/test/logs.html rename to src/static/vendor/qunit/test/logs.html diff --git a/vendor/qunit/test/logs.js b/src/static/vendor/qunit/test/logs.js similarity index 100% rename from vendor/qunit/test/logs.js rename to src/static/vendor/qunit/test/logs.js diff --git a/vendor/qunit/test/narwhal-test.js b/src/static/vendor/qunit/test/narwhal-test.js similarity index 100% rename from vendor/qunit/test/narwhal-test.js rename to src/static/vendor/qunit/test/narwhal-test.js diff --git a/vendor/qunit/test/node-test.js b/src/static/vendor/qunit/test/node-test.js similarity index 100% rename from vendor/qunit/test/node-test.js rename to src/static/vendor/qunit/test/node-test.js diff --git a/vendor/qunit/test/same.js b/src/static/vendor/qunit/test/same.js similarity index 100% rename from vendor/qunit/test/same.js rename to src/static/vendor/qunit/test/same.js diff --git a/vendor/qunit/test/swarminject.js b/src/static/vendor/qunit/test/swarminject.js similarity index 100% rename from vendor/qunit/test/swarminject.js rename to src/static/vendor/qunit/test/swarminject.js diff --git a/vendor/qunit/test/test.js b/src/static/vendor/qunit/test/test.js similarity index 100% rename from vendor/qunit/test/test.js rename to src/static/vendor/qunit/test/test.js diff --git a/vendor/right.js b/src/static/vendor/right.js similarity index 100% rename from vendor/right.js rename to src/static/vendor/right.js diff --git a/vendor/zepto.js b/src/static/vendor/zepto.js similarity index 100% rename from vendor/zepto.js rename to src/static/vendor/zepto.js From de83798cece20793b0b364076747dbd05ec03078 Mon Sep 17 00:00:00 2001 From: Benjamin Lupton Date: Sat, 27 Jul 2013 04:59:37 -0400 Subject: [PATCH 2/7] updated json2 version --- src/static/lib/json2.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/static/lib/json2.js b/src/static/lib/json2.js index 9317ae8b..051a545e 100644 --- a/src/static/lib/json2.js +++ b/src/static/lib/json2.js @@ -1,6 +1,6 @@ /* json2.js - 2012-10-08 + 2013-05-26 Public Domain. @@ -173,7 +173,7 @@ if (typeof JSON !== 'object') { if (typeof Date.prototype.toJSON !== 'function') { - Date.prototype.toJSON = function (key) { + Date.prototype.toJSON = function () { return isFinite(this.valueOf()) ? this.getUTCFullYear() + '-' + @@ -187,7 +187,7 @@ if (typeof JSON !== 'object') { String.prototype.toJSON = Number.prototype.toJSON = - Boolean.prototype.toJSON = function (key) { + Boolean.prototype.toJSON = function () { return this.valueOf(); }; } From 8a200e88c92d4bdcaedb43d3e83640317c656e61 Mon Sep 17 00:00:00 2001 From: Benjamin Lupton Date: Sat, 27 Jul 2013 05:27:47 -0400 Subject: [PATCH 3/7] Updated tests to use layouts --- package.json | 83 ++++++------- src/layouts/default.html.eco | 27 +++++ src/layouts/test.html.eco | 68 +++++++++++ src/render/demo/bcherry-orig.html | 104 +++++++--------- src/render/demo/bcherry.html | 112 ++++++++--------- src/render/demo/chrome.html | 63 +++++----- src/render/demo/index.html | 135 ++++++++++----------- src/render/demo/native-auto.html | 79 ++++++------ src/render/demo/native.html | 112 ++++++++--------- src/render/demo/navigator.html | 33 +++-- src/render/demo/safari.html | 122 +++++++++---------- src/render/demo/unicode.html | 126 +++++++++---------- src/static/tests/html4+html5.dojo.html | 60 +-------- src/static/tests/html4+html5.extjs.html | 60 +-------- src/static/tests/html4+html5.jquery.html | 48 +------- src/static/tests/html4+html5.mootools.html | 48 +------- src/static/tests/html4+html5.native.html | 48 +------- src/static/tests/html4+html5.right.html | 48 +------- src/static/tests/html4+html5.zepto.html | 48 +------- src/static/tests/html5.dojo.html | 47 +------ src/static/tests/html5.extjs.html | 47 +------ src/static/tests/html5.jquery.html | 47 +------ src/static/tests/html5.mootools.html | 47 +------ src/static/tests/html5.native.html | 47 +------ src/static/tests/html5.right.html | 47 +------ src/static/tests/html5.zepto.html | 47 +------ src/static/tests/index.html | 69 ++++------- 27 files changed, 640 insertions(+), 1182 deletions(-) create mode 100644 src/layouts/default.html.eco create mode 100644 src/layouts/test.html.eco diff --git a/package.json b/package.json index 0d30fecd..16a86232 100644 --- a/package.json +++ b/package.json @@ -1,42 +1,43 @@ { - "name": "history.js", - "version": "1.8.0", - "description": "History.js gracefully supports the HTML5 History/State APIs (pushState, replaceState, onPopState) in all browsers. Including continued support for data, titles, replaceState. Supports jQuery, MooTools and Prototype. For HTML5 browsers this means that you can modify the URL directly, without needing to use hashes anymore. For HTML4 browsers it will revert back to using the old onhashchange functionality.", - "homepage": "https://historyjs.net", - "keywords": [ - "javascript", - "html5 history api", - "hashchange", - "popstate", - "pushstate", - "replacestate", - "hashes", - "hashbang" - ], - "author": "Benjamin Lupton (http://balupton.com)", - "maintainers": [ - "Benjamin Lupton (https://github.com/balupton)", - "Andreas Bernhard (http://www.bs-infosys.com)" - ], - "contributors": [ - "Benjamin Lupton (https://github.com/balupton)", - "Andreas Bernhard (http://www.bs-infosys.com)" - ], - "bugs": { - "url": "https://github.com/browserstate/history.js/issues" - }, - "repository": { - "type": "git", - "url": "http://github.com/browserstate/history.js.git" - }, - "engines": {}, - "licenses": [ - { - "type": "New-BSD", - "url": "http://creativecommons.org/licenses/BSD/" - } - ], - "dependencies": { - "docpad": "~6.46.4" - } -} \ No newline at end of file + "name": "history.js", + "version": "1.8.0", + "description": "History.js gracefully supports the HTML5 History/State APIs (pushState, replaceState, onPopState) in all browsers. Including continued support for data, titles, replaceState. Supports jQuery, MooTools and Prototype. For HTML5 browsers this means that you can modify the URL directly, without needing to use hashes anymore. For HTML4 browsers it will revert back to using the old onhashchange functionality.", + "homepage": "https://historyjs.net", + "keywords": [ + "javascript", + "html5 history api", + "hashchange", + "popstate", + "pushstate", + "replacestate", + "hashes", + "hashbang" + ], + "author": "Benjamin Lupton (http://balupton.com)", + "maintainers": [ + "Benjamin Lupton (https://github.com/balupton)", + "Andreas Bernhard (http://www.bs-infosys.com)" + ], + "contributors": [ + "Benjamin Lupton (https://github.com/balupton)", + "Andreas Bernhard (http://www.bs-infosys.com)" + ], + "bugs": { + "url": "https://github.com/browserstate/history.js/issues" + }, + "repository": { + "type": "git", + "url": "http://github.com/browserstate/history.js.git" + }, + "engines": {}, + "licenses": [ + { + "type": "New-BSD", + "url": "http://creativecommons.org/licenses/BSD/" + } + ], + "dependencies": { + "docpad": "~6.46.4", + "docpad-plugin-eco": "~2.0.2" + } +} diff --git a/src/layouts/default.html.eco b/src/layouts/default.html.eco new file mode 100644 index 00000000..ac21bd6d --- /dev/null +++ b/src/layouts/default.html.eco @@ -0,0 +1,27 @@ + + + + + + + + + + Codestin Search App + + + + + <%- @getBlock('meta').toHTML() %> + + + <%- @getBlock('styles').add(@site.styles).toHTML() %> + + + + <%- @content %> + + + <%- @getBlock('scripts').add(@site.scripts).toHTML() %> + + \ No newline at end of file diff --git a/src/layouts/test.html.eco b/src/layouts/test.html.eco new file mode 100644 index 00000000..84bd8c45 --- /dev/null +++ b/src/layouts/test.html.eco @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + Codestin Search App + + + + + <%- @getBlock('meta').toHTML() %> + + + + + + + + + + <%- @getBlock('styles').add(@site.styles).toHTML() %> + + + + + + +

History.js <%- if @document.html4 is true then 'HTML4+HTML5' else 'HTML5' %> <%- @document.framework %> Test Suite

+

+
+

+
    +
    test markup
    + + + + + + + <% if @document.html4 is true: %><% end %> + + + + + + + <%- @content %> + + + <%- @getBlock('scripts').add(@site.scripts).toHTML() %> + + \ No newline at end of file diff --git a/src/render/demo/bcherry-orig.html b/src/render/demo/bcherry-orig.html index 43672f49..f272bb78 100644 --- a/src/render/demo/bcherry-orig.html +++ b/src/render/demo/bcherry-orig.html @@ -1,58 +1,46 @@ - - - - - - - Codestin Search App - - - - - - - - - - - - - -
    -

    There's a bug in the HTML5 "popstate" event, as implemented in WebKit (Safari and Chrome). View this page in one of those browsers. Your browser has had history entries added from #0 to #19 (you should start at #19). Hitting back/forward will navigate through these. On each URL, the large number above should reflect the hash value. If you hit back/forward quickly, you'll notice that your number gets out of sync with the URL. This is because WebKit is dropping popstate events (they are not firing). It seems to happen when outbound network requests are in progress when the user navigates in their browser happens. In this case, your browser is downloading an image that takes 1s to serve on every popstate, so you'll have to wait 1s between backs/forwards to have the feature work correctly. You could also cause constant network traffic by putting an image download in a setInterval, in which case your popstate events will never fire. This implementation simulates an AJAX application that makes a network request when you navigate between URLs using pushState/popstate. View the source for more info.

    -

    This was filed as Bug 42940 with WebKit on July 24, 2010. The Firefox 4 beta does not have this bug, which is good news.

    -

    This is put together by Ben Cherry. Ben is a front-end engineer at Twitter, and you can follow him at @bcherry.

    - - - +--- +title: WebKit is Dropping HTML5 "popstate" Events +layout: default +scripts: + - /vendor/jquery.js + - /lib/history.adapter.jquery.js + - /lib/history.js +--- + + + +
    +

    There's a bug in the HTML5 "popstate" event, as implemented in WebKit (Safari and Chrome). View this page in one of those browsers. Your browser has had history entries added from #0 to #19 (you should start at #19). Hitting back/forward will navigate through these. On each URL, the large number above should reflect the hash value. If you hit back/forward quickly, you'll notice that your number gets out of sync with the URL. This is because WebKit is dropping popstate events (they are not firing). It seems to happen when outbound network requests are in progress when the user navigates in their browser happens. In this case, your browser is downloading an image that takes 1s to serve on every popstate, so you'll have to wait 1s between backs/forwards to have the feature work correctly. You could also cause constant network traffic by putting an image download in a setInterval, in which case your popstate events will never fire. This implementation simulates an AJAX application that makes a network request when you navigate between URLs using pushState/popstate. View the source for more info.

    +

    This was filed as Bug 42940 with WebKit on July 24, 2010. The Firefox 4 beta does not have this bug, which is good news.

    +

    This is put together by Ben Cherry. Ben is a front-end engineer at Twitter, and you can follow him at @bcherry.

    + + \ No newline at end of file diff --git a/src/render/demo/bcherry.html b/src/render/demo/bcherry.html index 309f4d44..7bcf38dc 100644 --- a/src/render/demo/bcherry.html +++ b/src/render/demo/bcherry.html @@ -1,62 +1,50 @@ - - - - - - - Codestin Search App - - - - - - - - - - - - - -
    -

    There's a bug in the HTML5 "popstate" event, as implemented in WebKit (Safari and Chrome). View this page in one of those browsers. Your browser has had history entries added from #0 to #19 (you should start at #19). Hitting back/forward will navigate through these. On each URL, the large number above should reflect the hash value. If you hit back/forward quickly, you'll notice that your number gets out of sync with the URL. This is because WebKit is dropping popstate events (they are not firing). It seems to happen when outbound network requests are in progress when the user navigates in their browser happens. In this case, your browser is downloading an image that takes 1s to serve on every popstate, so you'll have to wait 1s between backs/forwards to have the feature work correctly. You could also cause constant network traffic by putting an image download in a setInterval, in which case your popstate events will never fire. This implementation simulates an AJAX application that makes a network request when you navigate between URLs using pushState/popstate. View the source for more info.

    -

    This was filed as Bug 42940 with WebKit on July 24, 2010. The Firefox 4 beta does not have this bug, which is good news.

    -

    This is put together by Ben Cherry. Ben is a front-end engineer at Twitter, and you can follow him at @bcherry.

    -

    This bug was fixed in History.js by Benjamin Lupton. Benjamin is a freelance web 2.0 consultant, and you can follow him at @balupton.

    - - - +--- +title: WebKit is Dropping HTML5 "popstate" Events +layout: default +scripts: + - /vendor/jquery.js + - /lib/history.adapter.js + - /lib/history.js +--- + + + +
    +

    There's a bug in the HTML5 "popstate" event, as implemented in WebKit (Safari and Chrome). View this page in one of those browsers. Your browser has had history entries added from #0 to #19 (you should start at #19). Hitting back/forward will navigate through these. On each URL, the large number above should reflect the hash value. If you hit back/forward quickly, you'll notice that your number gets out of sync with the URL. This is because WebKit is dropping popstate events (they are not firing). It seems to happen when outbound network requests are in progress when the user navigates in their browser happens. In this case, your browser is downloading an image that takes 1s to serve on every popstate, so you'll have to wait 1s between backs/forwards to have the feature work correctly. You could also cause constant network traffic by putting an image download in a setInterval, in which case your popstate events will never fire. This implementation simulates an AJAX application that makes a network request when you navigate between URLs using pushState/popstate. View the source for more info.

    +

    This was filed as Bug 42940 with WebKit on July 24, 2010. The Firefox 4 beta does not have this bug, which is good news.

    +

    This is put together by Ben Cherry. Ben is a front-end engineer at Twitter, and you can follow him at @bcherry.

    +

    This bug was fixed in History.js by Benjamin Lupton. Benjamin is a freelance web 2.0 consultant, and you can follow him at @balupton.

    + + \ No newline at end of file diff --git a/src/render/demo/chrome.html b/src/render/demo/chrome.html index a2791a31..baf29dd9 100644 --- a/src/render/demo/chrome.html +++ b/src/render/demo/chrome.html @@ -1,37 +1,36 @@ - - - Codestin Search App - - -

    This demo demonstrates an issue with Google Chrome versions 8-10 (possibly 11) where if you push a state with data, then do history.back to the initial state, the event.state will contain the pushed states data instead of being null.

    -

    Note: The issue requires a clean history list, as such this should always be opened in a new tab/window where there are no prior history items.

    -

    Reported by Benjamin Lupton author of History.js

    - - - - - - + setTimeout(function(){ + history.back(); + },2e3); + }; + + document.getElementById('reset').onclick = function(){ + document.location.href = document.location.href.replace(/[\#\?].*/,""); + }; + + })(); + \ No newline at end of file diff --git a/src/render/demo/index.html b/src/render/demo/index.html index 7e538b5c..3f73027c 100644 --- a/src/render/demo/index.html +++ b/src/render/demo/index.html @@ -1,84 +1,75 @@ - - - - - - Codestin Search App - - - - - - +--- +title: History.js +layout: default +scripts: + - /vendor/json2.js + - /vendor/jquery.js + - /lib/history.adapter.jquery.js + - /lib/history.html4.js + - /lib/history.js +--- - -
    - -

    History.js

    -

    History.js gracefully supports the HTML5 History/State APIs (pushState, replaceState, onPopState) in all browsers. Including continued support for data, titles, replaceState. Supports jQuery, MooTools and Prototype. For HTML5 browsers this means that you can modify the URL directly, without needing to use hashes anymore. For HTML4 browsers it will revert back to using the old onhashchange functionality.

    + +

    History.js

    +

    History.js gracefully supports the HTML5 History/State APIs (pushState, replaceState, onPopState) in all browsers. Including continued support for data, titles, replaceState. Supports jQuery, MooTools and Prototype. For HTML5 browsers this means that you can modify the URL directly, without needing to use hashes anymore. For HTML4 browsers it will revert back to using the old onhashchange functionality.

    - - + + - -

    Click through the buttons in order and you'll get the results demonstrated in the README.md file.

    + +

    Click through the buttons in order and you'll get the results demonstrated in the README.md file.

    - -
      -
    + +
      +
    - - -
    - - + })(); + \ No newline at end of file diff --git a/src/render/demo/native-auto.html b/src/render/demo/native-auto.html index 1ea10ffa..919d164d 100644 --- a/src/render/demo/native-auto.html +++ b/src/render/demo/native-auto.html @@ -1,43 +1,40 @@ - - - - - - - + setTimeout(function(){ + history.pushState({page: 1}, "title 1", "?page=1"); + },1e3); + setTimeout(function(){ + history.pushState({page: 2}, "title 2", "?page=2"); + },2e3); + setTimeout(function(){ + history.replaceState({page: 3}, "title 3", "?page=3"); + },3e3); + setTimeout(function(){ + document.location.hash = 'asd'; + },4e3); + setTimeout(function(){ + history.back(); // alerts "location: http://example.com/example.html?page=3#asd, state: {"page":3}" + },5e3); + setTimeout(function(){ + history.back(); // alerts "location: http://example.com/example.html?page=1, state: {"page":1}" + },6e3); + setTimeout(function(){ + history.back(); // alerts "location: http://example.com/example.html, state: null + },7e3); + setTimeout(function(){ + history.go(2); // alerts "location: http://example.com/example.html?page=3, state: {"page":3} + },8e3); + })(); + \ No newline at end of file diff --git a/src/render/demo/native.html b/src/render/demo/native.html index 010f89a0..1a84d5c8 100644 --- a/src/render/demo/native.html +++ b/src/render/demo/native.html @@ -1,62 +1,62 @@ - - - Codestin Search App - - - -
    -
    - - - + $url.innerHTML = location.href; + $log.innerHTML += message; + console.log(message); + }; + + // Prepare Buttons + var + buttons = document.getElementById('buttons'), + scripts = [ + 'history.pushState({state:1}, "State 1", "?state=1");', + 'history.pushState({state:2}, "State 2", "?state=2");', + 'history.replaceState({state:3}, "State 3", "?state=3");', + 'location.hash = Math.random();', + 'history.back();', + 'history.forward();', + 'document.location.href = document.location.href.replace(/[\#\?].*/,"");' + ], + buttonsHTML = '' + ; + + // Add Buttons + for ( var i=0,n=scripts.length; i'; + } + buttons.innerHTML = buttonsHTML; + })(); + \ No newline at end of file diff --git a/src/render/demo/navigator.html b/src/render/demo/navigator.html index f9b15844..bd3d52f6 100644 --- a/src/render/demo/navigator.html +++ b/src/render/demo/navigator.html @@ -1,23 +1,20 @@ - - - - - Codestin Search App - - - - - - - + })(); + \ No newline at end of file diff --git a/src/render/demo/safari.html b/src/render/demo/safari.html index 5da17755..64be32d0 100644 --- a/src/render/demo/safari.html +++ b/src/render/demo/safari.html @@ -1,61 +1,61 @@ - - - Codestin Search App - - -

    This demo demonstrates an issue with Safari 5.0.4 (6533.20.27) handing of hashes and replace state. When a hash is set, and then replaced using replaceState the history list are then broken, when traversing back the hash does not change.

    -

    Note: The issue requires a clean history list, as such this should always be opened in a new tab/window where there are no prior history items.

    -

    Reported by Benjamin Lupton author of History.js

    - - - - - - - +--- +title: Safari Hash ReplaceState History Traversal Bug +layout: default +--- + +

    This demo demonstrates an issue with Safari 5.0.4 (6533.20.27) handing of hashes and replace state. When a hash is set, and then replaced using replaceState the history list are then broken, when traversing back the hash does not change.

    +

    Note: The issue requires a clean history list, as such this should always be opened in a new tab/window where there are no prior history items.

    +

    Reported by Benjamin Lupton author of History.js

    + + + + + + + \ No newline at end of file diff --git a/src/render/demo/unicode.html b/src/render/demo/unicode.html index e34e562f..7d747485 100644 --- a/src/render/demo/unicode.html +++ b/src/render/demo/unicode.html @@ -1,79 +1,69 @@ - - - - - - Codestin Search App - - - - - - +--- +title: History.js Unicode +layout: default +scripts: + - /vendor/json2.js + - /vendor/jquery.js + - /lib/history.adapter.jquery.js + - /lib/history.html4.js + - /lib/history.js +--- - -
    - -

    History.js

    -

    History.js gracefully supports unicode.

    + +

    History.js

    +

    History.js gracefully supports unicode.

    - - + + - -
      -
    + +
      - - -
      - - + })(); + \ No newline at end of file diff --git a/src/static/tests/html4+html5.dojo.html b/src/static/tests/html4+html5.dojo.html index af5f4d8b..c57897a6 100644 --- a/src/static/tests/html4+html5.dojo.html +++ b/src/static/tests/html4+html5.dojo.html @@ -1,55 +1,5 @@ - - - - - - - - Codestin Search App - - - - - - - - - - - - - - -

      History.js HTML4+HTML5 Dojo Test Suite

      -

      -
      -

      -
        -
        test markup
        - - - - - - - - - - - - - - - - - +--- +framework: Dojo +html4: true +layout: test +--- \ No newline at end of file diff --git a/src/static/tests/html4+html5.extjs.html b/src/static/tests/html4+html5.extjs.html index e82577a8..6bc2b097 100644 --- a/src/static/tests/html4+html5.extjs.html +++ b/src/static/tests/html4+html5.extjs.html @@ -1,55 +1,5 @@ - - - - - - - - Codestin Search App - - - - - - - - - - - - - - -

        History.js HTML4+HTML5 ExtJS Test Suite

        -

        -
        -

        -
          -
          test markup
          - - - - - - - - - - - - - - - - - +--- +framework: ExtJS +html4: true +layout: test +--- \ No newline at end of file diff --git a/src/static/tests/html4+html5.jquery.html b/src/static/tests/html4+html5.jquery.html index a99b9569..4aefbdec 100644 --- a/src/static/tests/html4+html5.jquery.html +++ b/src/static/tests/html4+html5.jquery.html @@ -1,43 +1,5 @@ - - - - - - - - Codestin Search App - - - - - - - - - - - - - -

          History.js HTML4+HTML5 Jquery Test Suite

          -

          -
          -

          -
            -
            test markup
            - - - - - - - - - - \ No newline at end of file +--- +framework: jQuery +html4: true +layout: test +--- \ No newline at end of file diff --git a/src/static/tests/html4+html5.mootools.html b/src/static/tests/html4+html5.mootools.html index 792f9752..2d4262bf 100644 --- a/src/static/tests/html4+html5.mootools.html +++ b/src/static/tests/html4+html5.mootools.html @@ -1,43 +1,5 @@ - - - - - - - - Codestin Search App - - - - - - - - - - - - - -

            History.js HTML4+HTML5 Mootools Test Suite

            -

            -
            -

            -
              -
              test markup
              - - - - - - - - - - \ No newline at end of file +--- +framework: MooTools +html4: true +layout: test +--- \ No newline at end of file diff --git a/src/static/tests/html4+html5.native.html b/src/static/tests/html4+html5.native.html index c4fd8522..43c2099a 100644 --- a/src/static/tests/html4+html5.native.html +++ b/src/static/tests/html4+html5.native.html @@ -1,43 +1,5 @@ - - - - - - - - Codestin Search App - - - - - - - - - - - - - -

              History.js HTML4+HTML5 Native Test Suite

              -

              -
              -

              -
                -
                test markup
                - - - - - - - - - - \ No newline at end of file +--- +framework: Native +html4: true +layout: test +--- \ No newline at end of file diff --git a/src/static/tests/html4+html5.right.html b/src/static/tests/html4+html5.right.html index ae4fb036..370a9c30 100644 --- a/src/static/tests/html4+html5.right.html +++ b/src/static/tests/html4+html5.right.html @@ -1,43 +1,5 @@ - - - - - - - - Codestin Search App - - - - - - - - - - - - - -

                History.js HTML4+HTML5 Right Test Suite

                -

                -
                -

                -
                  -
                  test markup
                  - - - - - - - - - - \ No newline at end of file +--- +framework: Right +html4: true +layout: test +--- \ No newline at end of file diff --git a/src/static/tests/html4+html5.zepto.html b/src/static/tests/html4+html5.zepto.html index 71a6b7c9..7fe57583 100644 --- a/src/static/tests/html4+html5.zepto.html +++ b/src/static/tests/html4+html5.zepto.html @@ -1,43 +1,5 @@ - - - - - - - - Codestin Search App - - - - - - - - - - - - - -

                  History.js HTML4+HTML5 Zepto Test Suite

                  -

                  -
                  -

                  -
                    -
                    test markup
                    - - - - - - - - - - \ No newline at end of file +--- +framework: Zepto +html4: true +layout: test +--- \ No newline at end of file diff --git a/src/static/tests/html5.dojo.html b/src/static/tests/html5.dojo.html index 3e222753..0b38ca72 100644 --- a/src/static/tests/html5.dojo.html +++ b/src/static/tests/html5.dojo.html @@ -1,43 +1,4 @@ - - - - - - - - Codestin Search App - - - - - - - - - - - - - -

                    History.js HTML5 Dojo Test Suite

                    -

                    -
                    -

                    -
                      -
                      test markup
                      - - - - - - - - - - +--- +framework: Dojo +layout: test +--- \ No newline at end of file diff --git a/src/static/tests/html5.extjs.html b/src/static/tests/html5.extjs.html index 2446b72c..170f570b 100644 --- a/src/static/tests/html5.extjs.html +++ b/src/static/tests/html5.extjs.html @@ -1,43 +1,4 @@ - - - - - - - - Codestin Search App - - - - - - - - - - - - - -

                      History.js HTML5 ExtJS Test Suite

                      -

                      -
                      -

                      -
                        -
                        test markup
                        - - - - - - - - - - +--- +framework: ExtJS +layout: test +--- \ No newline at end of file diff --git a/src/static/tests/html5.jquery.html b/src/static/tests/html5.jquery.html index 977b8fed..b6b8dd17 100644 --- a/src/static/tests/html5.jquery.html +++ b/src/static/tests/html5.jquery.html @@ -1,43 +1,4 @@ - - - - - - - - Codestin Search App - - - - - - - - - - - - - -

                        History.js HTML5 Jquery Test Suite

                        -

                        -
                        -

                        -
                          -
                          test markup
                          - - - - - - - - - - \ No newline at end of file +--- +framework: jQuery +layout: test +--- \ No newline at end of file diff --git a/src/static/tests/html5.mootools.html b/src/static/tests/html5.mootools.html index 30ee7892..78cfdc9e 100644 --- a/src/static/tests/html5.mootools.html +++ b/src/static/tests/html5.mootools.html @@ -1,43 +1,4 @@ - - - - - - - - Codestin Search App - - - - - - - - - - - - - -

                          History.js HTML5 Mootools Test Suite

                          -

                          -
                          -

                          -
                            -
                            test markup
                            - - - - - - - - - - \ No newline at end of file +--- +framework: MooTools +layout: test +--- \ No newline at end of file diff --git a/src/static/tests/html5.native.html b/src/static/tests/html5.native.html index 8ffc4c34..69c546b5 100644 --- a/src/static/tests/html5.native.html +++ b/src/static/tests/html5.native.html @@ -1,43 +1,4 @@ - - - - - - - - Codestin Search App - - - - - - - - - - - - - -

                            History.js HTML5 Native Test Suite

                            -

                            -
                            -

                            -
                              -
                              test markup
                              - - - - - - - - - - \ No newline at end of file +--- +framework: Native +layout: test +--- \ No newline at end of file diff --git a/src/static/tests/html5.right.html b/src/static/tests/html5.right.html index 7a2c08b5..48bea14a 100644 --- a/src/static/tests/html5.right.html +++ b/src/static/tests/html5.right.html @@ -1,43 +1,4 @@ - - - - - - - - Codestin Search App - - - - - - - - - - - - - -

                              History.js HTML5 Right Test Suite

                              -

                              -
                              -

                              -
                                -
                                test markup
                                - - - - - - - - - - \ No newline at end of file +--- +framework: Right +layout: test +--- \ No newline at end of file diff --git a/src/static/tests/html5.zepto.html b/src/static/tests/html5.zepto.html index d6657091..0b14a0de 100644 --- a/src/static/tests/html5.zepto.html +++ b/src/static/tests/html5.zepto.html @@ -1,43 +1,4 @@ - - - - - - - - Codestin Search App - - - - - - - - - - - - - -

                                History.js HTML5 Zepto Test Suite

                                -

                                -
                                -

                                -
                                  -
                                  test markup
                                  - - - - - - - - - - \ No newline at end of file +--- +framework: Zepto +layout: test +--- \ No newline at end of file diff --git a/src/static/tests/index.html b/src/static/tests/index.html index 41436824..2a87dc4e 100644 --- a/src/static/tests/index.html +++ b/src/static/tests/index.html @@ -1,47 +1,22 @@ - - - - Codestin Search App - - - -

                                  History.js Test Suite

                                  -

                                  HTML5 Browsers must pass the HTML4+HTML5 tests, HTML4 Browsers must pass the HTML4 tests and should fail the HTML5 tests.

                                  - -
                                  -

                                  HTML 4+5

                                  -
                                  Dojo Test Suite
                                  -
                                  ExtJS Test Suite
                                  -
                                  jQuery Test Suite
                                  -
                                  Mootools Test Suite
                                  -
                                  Native Test Suite
                                  -
                                  Right Test Suite
                                  -
                                  Zepto Test Suite (Zepto doesn't support IE)
                                  -
                                  -
                                  -

                                  HTML 5

                                  -
                                  Dojo Test Suite
                                  -
                                  ExtJS Test Suite
                                  -
                                  jQuery Test Suite
                                  -
                                  Mootools Test Suite
                                  -
                                  Native Test Suite
                                  -
                                  Right Test Suite
                                  -
                                  Zepto Test Suite (Zepto doesn't support IE)
                                  -
                                  - - +--- +title: History.js Test Suite +layout: default +--- + +

                                  History.js Test Suite

                                  +

                                  HTML5 Browsers must pass the HTML4+HTML5 tests, HTML4 Browsers must pass the HTML4 tests and should fail the HTML5 tests.

                                  +

                                  Zepto does not support IE, this is intended

                                  + +
                                  +

                                  HTML4+5

                                  +
                                    <% for item in @getFilesAtPath('tests/html4+html5').toJSON(): %> +
                                  • <%= item.title %>
                                    • + <% end %>
                                  +
                                  + +
                                  +

                                  HTML 5

                                  +
                                    <% for item in @getFilesAtPath('tests/html5').toJSON(): %> +
                                  • <%= item.title %>
                                    • + <% end %>
                                  +
                                  \ No newline at end of file From 01257ba3163553d203fb00fd8f73dd3493104006 Mon Sep 17 00:00:00 2001 From: Benjamin Lupton Date: Sat, 27 Jul 2013 05:27:59 -0400 Subject: [PATCH 4/7] rename test index --- src/static/tests/{index.html => index.html.eco} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/static/tests/{index.html => index.html.eco} (100%) diff --git a/src/static/tests/index.html b/src/static/tests/index.html.eco similarity index 100% rename from src/static/tests/index.html rename to src/static/tests/index.html.eco From 7044e6c043331fab23c263c9e4934264528661cf Mon Sep 17 00:00:00 2001 From: Benjamin Lupton Date: Sat, 27 Jul 2013 05:28:42 -0400 Subject: [PATCH 5/7] moved tests to render --- src/{static => render}/tests/.htaccess | 0 .../tests/html4+html5.dojo.html | 0 .../tests/html4+html5.extjs.html | 0 .../tests/html4+html5.jquery.html | 0 .../tests/html4+html5.mootools.html | 0 .../tests/html4+html5.native.html | 0 .../tests/html4+html5.right.html | 0 .../tests/html4+html5.zepto.html | 0 src/{static => render}/tests/html5.dojo.html | 0 src/{static => render}/tests/html5.extjs.html | 0 .../tests/html5.jquery.html | 0 .../tests/html5.mootools.html | 0 .../tests/html5.native.html | 0 src/{static => render}/tests/html5.right.html | 0 src/{static => render}/tests/html5.zepto.html | 0 src/{static => render}/tests/image.php | 0 src/{static => render}/tests/index.html.eco | 0 src/{static => render}/tests/tests.js | 0 src/static/tests.src/_header.php | 22 -------- src/static/tests.src/all.php | 45 ---------------- src/static/tests.src/each.php | 51 ------------------- src/static/tests.src/index.php | 23 --------- 22 files changed, 141 deletions(-) rename src/{static => render}/tests/.htaccess (100%) rename src/{static => render}/tests/html4+html5.dojo.html (100%) rename src/{static => render}/tests/html4+html5.extjs.html (100%) rename src/{static => render}/tests/html4+html5.jquery.html (100%) rename src/{static => render}/tests/html4+html5.mootools.html (100%) rename src/{static => render}/tests/html4+html5.native.html (100%) rename src/{static => render}/tests/html4+html5.right.html (100%) rename src/{static => render}/tests/html4+html5.zepto.html (100%) rename src/{static => render}/tests/html5.dojo.html (100%) rename src/{static => render}/tests/html5.extjs.html (100%) rename src/{static => render}/tests/html5.jquery.html (100%) rename src/{static => render}/tests/html5.mootools.html (100%) rename src/{static => render}/tests/html5.native.html (100%) rename src/{static => render}/tests/html5.right.html (100%) rename src/{static => render}/tests/html5.zepto.html (100%) rename src/{static => render}/tests/image.php (100%) rename src/{static => render}/tests/index.html.eco (100%) rename src/{static => render}/tests/tests.js (100%) delete mode 100644 src/static/tests.src/_header.php delete mode 100644 src/static/tests.src/all.php delete mode 100644 src/static/tests.src/each.php delete mode 100644 src/static/tests.src/index.php diff --git a/src/static/tests/.htaccess b/src/render/tests/.htaccess similarity index 100% rename from src/static/tests/.htaccess rename to src/render/tests/.htaccess diff --git a/src/static/tests/html4+html5.dojo.html b/src/render/tests/html4+html5.dojo.html similarity index 100% rename from src/static/tests/html4+html5.dojo.html rename to src/render/tests/html4+html5.dojo.html diff --git a/src/static/tests/html4+html5.extjs.html b/src/render/tests/html4+html5.extjs.html similarity index 100% rename from src/static/tests/html4+html5.extjs.html rename to src/render/tests/html4+html5.extjs.html diff --git a/src/static/tests/html4+html5.jquery.html b/src/render/tests/html4+html5.jquery.html similarity index 100% rename from src/static/tests/html4+html5.jquery.html rename to src/render/tests/html4+html5.jquery.html diff --git a/src/static/tests/html4+html5.mootools.html b/src/render/tests/html4+html5.mootools.html similarity index 100% rename from src/static/tests/html4+html5.mootools.html rename to src/render/tests/html4+html5.mootools.html diff --git a/src/static/tests/html4+html5.native.html b/src/render/tests/html4+html5.native.html similarity index 100% rename from src/static/tests/html4+html5.native.html rename to src/render/tests/html4+html5.native.html diff --git a/src/static/tests/html4+html5.right.html b/src/render/tests/html4+html5.right.html similarity index 100% rename from src/static/tests/html4+html5.right.html rename to src/render/tests/html4+html5.right.html diff --git a/src/static/tests/html4+html5.zepto.html b/src/render/tests/html4+html5.zepto.html similarity index 100% rename from src/static/tests/html4+html5.zepto.html rename to src/render/tests/html4+html5.zepto.html diff --git a/src/static/tests/html5.dojo.html b/src/render/tests/html5.dojo.html similarity index 100% rename from src/static/tests/html5.dojo.html rename to src/render/tests/html5.dojo.html diff --git a/src/static/tests/html5.extjs.html b/src/render/tests/html5.extjs.html similarity index 100% rename from src/static/tests/html5.extjs.html rename to src/render/tests/html5.extjs.html diff --git a/src/static/tests/html5.jquery.html b/src/render/tests/html5.jquery.html similarity index 100% rename from src/static/tests/html5.jquery.html rename to src/render/tests/html5.jquery.html diff --git a/src/static/tests/html5.mootools.html b/src/render/tests/html5.mootools.html similarity index 100% rename from src/static/tests/html5.mootools.html rename to src/render/tests/html5.mootools.html diff --git a/src/static/tests/html5.native.html b/src/render/tests/html5.native.html similarity index 100% rename from src/static/tests/html5.native.html rename to src/render/tests/html5.native.html diff --git a/src/static/tests/html5.right.html b/src/render/tests/html5.right.html similarity index 100% rename from src/static/tests/html5.right.html rename to src/render/tests/html5.right.html diff --git a/src/static/tests/html5.zepto.html b/src/render/tests/html5.zepto.html similarity index 100% rename from src/static/tests/html5.zepto.html rename to src/render/tests/html5.zepto.html diff --git a/src/static/tests/image.php b/src/render/tests/image.php similarity index 100% rename from src/static/tests/image.php rename to src/render/tests/image.php diff --git a/src/static/tests/index.html.eco b/src/render/tests/index.html.eco similarity index 100% rename from src/static/tests/index.html.eco rename to src/render/tests/index.html.eco diff --git a/src/static/tests/tests.js b/src/render/tests/tests.js similarity index 100% rename from src/static/tests/tests.js rename to src/render/tests/tests.js diff --git a/src/static/tests.src/_header.php b/src/static/tests.src/_header.php deleted file mode 100644 index 9b085101..00000000 --- a/src/static/tests.src/_header.php +++ /dev/null @@ -1,22 +0,0 @@ - - - - Codestin Search App - - - -

                                  History.js Test Suite

                                  -

                                  HTML5 Browsers must pass the HTML4+HTML5 tests

                                  -

                                  HTML4 Browsers must pass the HTML4 tests and should fail the HTML5 tests

                                  - '; - foreach ( $adapters as $adapter ) : - echo '
                                  '; - # Url - $url = "${browser}.${adapter}.html"; - - # Title - $Browser = ucwords($browser); - $Adapter = ucwords($adapter); - $title = "History.js ${Browser} ${Adapter} Test Suite"; - - # Render - ?>'; - endforeach; - echo '
                                  '; - endforeach; - ?> - - diff --git a/src/static/tests.src/each.php b/src/static/tests.src/each.php deleted file mode 100644 index 22f7b683..00000000 --- a/src/static/tests.src/each.php +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - Codestin Search App - - - - - - - - - - - - - -

                                  -

                                  -
                                  -

                                  -
                                    -
                                    test markup
                                    - - - - - - - - - - \ No newline at end of file diff --git a/src/static/tests.src/index.php b/src/static/tests.src/index.php deleted file mode 100644 index 44495d3e..00000000 --- a/src/static/tests.src/index.php +++ /dev/null @@ -1,23 +0,0 @@ -Tests From fd84138bc2a3ec3038341d2c74cedf92b71d7459 Mon Sep 17 00:00:00 2001 From: Benjamin Lupton Date: Sat, 27 Jul 2013 05:44:24 -0400 Subject: [PATCH 6/7] updated demos --- .gitignore | 6 +- docpad.coffee | 64 +++++++++++++++++++ src/layouts/default.html.eco | 4 +- src/layouts/test.html.eco | 8 +-- src/render/{demo => demos}/bcherry-orig.html | 0 src/render/{demo => demos}/bcherry.html | 0 src/render/{demo => demos}/chrome.html | 0 src/render/demos/index.html.eco | 12 ++++ .../unicode.html => demos/main-unicode.html} | 0 .../{demo/index.html => demos/main.html} | 7 +- src/render/{demo => demos}/native-auto.html | 0 src/render/{demo => demos}/native.html | 0 src/render/{demo => demos}/navigator.html | 0 src/render/{demo => demos}/safari.html | 0 ...+html5.dojo.html => html4+html5-dojo.html} | 0 ...tml5.extjs.html => html4+html5-extjs.html} | 0 ...l5.jquery.html => html4+html5-jquery.html} | 0 ...ootools.html => html4+html5-mootools.html} | 0 ...l5.native.html => html4+html5-native.html} | 0 ...tml5.right.html => html4+html5-right.html} | 0 ...tml5.zepto.html => html4+html5-zepto.html} | 0 .../{html5.dojo.html => html5-dojo.html} | 0 .../{html5.extjs.html => html5-extjs.html} | 0 .../{html5.jquery.html => html5-jquery.html} | 0 ...tml5.mootools.html => html5-mootools.html} | 0 .../{html5.native.html => html5-native.html} | 0 .../{html5.right.html => html5-right.html} | 0 .../{html5.zepto.html => html5-zepto.html} | 0 src/render/tests/index.html.eco | 10 +-- src/static/{lib => vendor}/json2.js | 0 30 files changed, 92 insertions(+), 19 deletions(-) create mode 100644 docpad.coffee rename src/render/{demo => demos}/bcherry-orig.html (100%) rename src/render/{demo => demos}/bcherry.html (100%) rename src/render/{demo => demos}/chrome.html (100%) create mode 100644 src/render/demos/index.html.eco rename src/render/{demo/unicode.html => demos/main-unicode.html} (100%) rename src/render/{demo/index.html => demos/main.html} (98%) rename src/render/{demo => demos}/native-auto.html (100%) rename src/render/{demo => demos}/native.html (100%) rename src/render/{demo => demos}/navigator.html (100%) rename src/render/{demo => demos}/safari.html (100%) rename src/render/tests/{html4+html5.dojo.html => html4+html5-dojo.html} (100%) rename src/render/tests/{html4+html5.extjs.html => html4+html5-extjs.html} (100%) rename src/render/tests/{html4+html5.jquery.html => html4+html5-jquery.html} (100%) rename src/render/tests/{html4+html5.mootools.html => html4+html5-mootools.html} (100%) rename src/render/tests/{html4+html5.native.html => html4+html5-native.html} (100%) rename src/render/tests/{html4+html5.right.html => html4+html5-right.html} (100%) rename src/render/tests/{html4+html5.zepto.html => html4+html5-zepto.html} (100%) rename src/render/tests/{html5.dojo.html => html5-dojo.html} (100%) rename src/render/tests/{html5.extjs.html => html5-extjs.html} (100%) rename src/render/tests/{html5.jquery.html => html5-jquery.html} (100%) rename src/render/tests/{html5.mootools.html => html5-mootools.html} (100%) rename src/render/tests/{html5.native.html => html5-native.html} (100%) rename src/render/tests/{html5.right.html => html5-right.html} (100%) rename src/render/tests/{html5.zepto.html => html5-zepto.html} (100%) rename src/static/{lib => vendor}/json2.js (100%) diff --git a/.gitignore b/.gitignore index ebb24a33..252089de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -.build -/node_modules -/.idea -npm-debug.log +node_modules/ +out/ \ No newline at end of file diff --git a/docpad.coffee b/docpad.coffee new file mode 100644 index 00000000..47f4ee15 --- /dev/null +++ b/docpad.coffee @@ -0,0 +1,64 @@ +# The DocPad Configuration File +# http://docpad.org/docs/config + +docpadConfig = + + # ================================= + # Template Data + # These are variables that will be accessible via our templates + # To access one of these within our templates, refer to the FAQ: https://github.com/bevry/docpad/wiki/FAQ + + templateData: + + # Specify some site properties + site: + # The production url of our website + url: "http://historyjs.net" + + # The default title of our website + title: "History.js" + + # The website description (for SEO) + description: """ + History.js gracefully supports the HTML5 History/State APIs (pushState, replaceState, onPopState) in all browsers. Including continued support for data, titles, replaceState. Supports jQuery, MooTools and Prototype. For HTML5 browsers this means that you can modify the URL directly, without needing to use hashes anymore. For HTML4 browsers it will revert back to using the old onhashchange functionality. + """ + + # The website keywords (for SEO) separated by commas + keywords: """ + history.js, historyjs, stateful, web apps, web applications, single page, ajax, pushtate, replacestate, hashchange, fragement identifier, html5, history api + """ + + # The website's styles + styles: [] + + # The website's scripts + scripts: [] + + + # ----------------------------- + # Helper Functions + + # Get the prepared site/document title + # Often we would like to specify particular formatting to our page's title + # we can apply that formatting here + getPreparedTitle: -> + # if we have a document title, then we should use that and suffix the site's title onto it + if @document.title + "#{@document.title} | #{@site.title}" + # if our document does not have it's own title, then we should just use the site's title + else + @site.title + + # Get the prepared site/document description + getPreparedDescription: -> + # if we have a document description, then we should use that, otherwise use the site's description + @document.description or @site.description + + # Get the prepared site/document keywords + getPreparedKeywords: -> + # Merge the document keywords with the site keywords + @site.keywords.concat(@document.keywords or []).join(', ') + + +# Export our DocPad Configuration +module.exports = docpadConfig \ No newline at end of file diff --git a/src/layouts/default.html.eco b/src/layouts/default.html.eco index ac21bd6d..a3eb36dc 100644 --- a/src/layouts/default.html.eco +++ b/src/layouts/default.html.eco @@ -15,13 +15,13 @@ <%- @getBlock('meta').toHTML() %> - <%- @getBlock('styles').add(@site.styles).toHTML() %> + <%- @getBlock('styles').add(@document.styles or []).toHTML() %> <%- @content %> - <%- @getBlock('scripts').add(@site.scripts).toHTML() %> + <%- @getBlock('scripts').add(@document.scripts or []).toHTML() %> \ No newline at end of file diff --git a/src/layouts/test.html.eco b/src/layouts/test.html.eco index 84bd8c45..db58ca01 100644 --- a/src/layouts/test.html.eco +++ b/src/layouts/test.html.eco @@ -51,10 +51,10 @@ - - - <% if @document.html4 is true: %><% end %> - + + + <% if @document.html4 is true: %><% end %> + diff --git a/src/render/demo/bcherry-orig.html b/src/render/demos/bcherry-orig.html similarity index 100% rename from src/render/demo/bcherry-orig.html rename to src/render/demos/bcherry-orig.html diff --git a/src/render/demo/bcherry.html b/src/render/demos/bcherry.html similarity index 100% rename from src/render/demo/bcherry.html rename to src/render/demos/bcherry.html diff --git a/src/render/demo/chrome.html b/src/render/demos/chrome.html similarity index 100% rename from src/render/demo/chrome.html rename to src/render/demos/chrome.html diff --git a/src/render/demos/index.html.eco b/src/render/demos/index.html.eco new file mode 100644 index 00000000..1a65c242 --- /dev/null +++ b/src/render/demos/index.html.eco @@ -0,0 +1,12 @@ +--- +title: History.js Demos +layout: default +--- + +

                                    History.js Demos

                                    + +
                                    +
                                      <% for demo in @getFilesAtPath('demos/').toJSON(): %> +
                                    • <%= demo.title %>
                                      • + <% end %>
                                    +
                                    \ No newline at end of file diff --git a/src/render/demo/unicode.html b/src/render/demos/main-unicode.html similarity index 100% rename from src/render/demo/unicode.html rename to src/render/demos/main-unicode.html diff --git a/src/render/demo/index.html b/src/render/demos/main.html similarity index 98% rename from src/render/demo/index.html rename to src/render/demos/main.html index 3f73027c..04d2272f 100644 --- a/src/render/demo/index.html +++ b/src/render/demos/main.html @@ -1,5 +1,6 @@ --- title: History.js +url: '/' layout: default scripts: - /vendor/json2.js @@ -20,8 +21,7 @@

                                    History.js

                                    Click through the buttons in order and you'll get the results demonstrated in the README.md file.

                                    -
                                      -
                                    +