s2/vanillajs-seed
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove arrive dependency

Browse Source
This commit is contained in:
s2
2019-04-14 22:14:12 +02:00
parent 52bea6d10d
commit 9d3cd7ec4f
6 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
index.html
View File

@@ -19,7 +19,6 @@
<script type="text/javascript" src="node_modules/page/page.js"></script> <script type="text/javascript" src="node_modules/page/page.js"></script>
<script type="text/javascript" src="node_modules/ejs/ejs.min.js"></script> <script type="text/javascript" src="node_modules/ejs/ejs.min.js"></script>
<script type="text/javascript" src="node_modules/ejs-render-remote/ejs-render-remote.js"></script> <script type="text/javascript" src="node_modules/ejs-render-remote/ejs-render-remote.js"></script>
<script type="text/javascript" src="js/thirdparty/arrive.js"></script>
<script type="text/javascript" src="js/language.js"></script> <script type="text/javascript" src="js/language.js"></script>

17
js/index.js
View File

@@ -16,7 +16,15 @@
MyApp.renderShell = function() { MyApp.renderShell = function() {
document.title = i18next.t('vanillaJS'); document.title = i18next.t('vanillaJS');
$('.js-main-content').html(ejs.rr('/templates/main.ejs')); var d = $.Deferred();
//preload this template, so we can be sure the dom in rendered when we resolve
ejs.preloadTemplate('/templates/main.ejs')
.then(function(templateUrl) {
$('.js-main-content').html(ejs.rr(templateUrl));
d.resolve();
});
return d;
}; };
MyApp.renderHomePage = function() { MyApp.renderHomePage = function() {
@@ -77,8 +85,9 @@
} }
}); });
// when main content is rendered, set up routing so the app starts up // render main shell
$(document).arrive('.js-page-container', {existing: true, onceOnly: true}, function() { MyApp.renderShell()
.then(function() {
//setup routing //setup routing
page('/', MyApp.renderHomePage); page('/', MyApp.renderHomePage);
page('/about', MyApp.renderAboutPage); page('/about', MyApp.renderAboutPage);
@@ -88,6 +97,4 @@
hashbang: true hashbang: true
}); });
}); });
MyApp.renderShell();
})(); })();

2
node_modules/ejs-render-remote/ejs-render-remote.js generated vendored
View File

@@ -64,7 +64,7 @@
ejs.cache.set(templateUrl, templateFn); ejs.cache.set(templateUrl, templateFn);
d.resolve(); d.resolve(templateUrl);
}); });
} }

20
node_modules/ejs-render-remote/package.json generated vendored
View File

@@ -1,27 +1,27 @@
{ {
"_from": "ejs-render-remote@1.0.2", "_from": "ejs-render-remote@1.0.3",
"_id": "ejs-render-remote@1.0.2", "_id": "ejs-render-remote@1.0.3",
"_inBundle": false, "_inBundle": false,
"_integrity": "sha512-UeEyN/ss0i+VYNANB5DISi8rgRkiL+/+wIxeFtYiEWozmZpjr2bktR1yU5XxIF2FprA3ULY7U1cqsJ0Cj1F5LA==", "_integrity": "sha512-5Tj0RGLQvBlpZdT1y1F/k7S4ayv9/WkljL/T2PiTJSh5NT4mgm2G+kPXYorfZyb4pomMqDc1vSo+VbLaaLHACg==",
"_location": "/ejs-render-remote", "_location": "/ejs-render-remote",
"_phantomChildren": {}, "_phantomChildren": {},
"_requested": { "_requested": {
"type": "version", "type": "version",
"registry": true, "registry": true,
"raw": "ejs-render-remote@1.0.2", "raw": "ejs-render-remote@1.0.3",
"name": "ejs-render-remote", "name": "ejs-render-remote",
"escapedName": "ejs-render-remote", "escapedName": "ejs-render-remote",
"rawSpec": "1.0.2", "rawSpec": "1.0.3",
"saveSpec": null, "saveSpec": null,
"fetchSpec": "1.0.2" "fetchSpec": "1.0.3"
}, },
"_requiredBy": [ "_requiredBy": [
"#USER", "#USER",
"/" "/"
], ],
"_resolved": "https://registry.npmjs.org/ejs-render-remote/-/ejs-render-remote-1.0.2.tgz", "_resolved": "https://registry.npmjs.org/ejs-render-remote/-/ejs-render-remote-1.0.3.tgz",
"_shasum": "101222d144bc2b45906e804af753a8558e455c8b", "_shasum": "425ae3451c557bfddf4fcc7e790545338068a865",
"_spec": "ejs-render-remote@1.0.2", "_spec": "ejs-render-remote@1.0.3",
"_where": "/home/s2/Code/vanillajs-seed", "_where": "/home/s2/Code/vanillajs-seed",
"author": { "author": {
"name": "s2", "name": "s2",
@@ -42,5 +42,5 @@
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1"
}, },
"version": "1.0.2" "version": "1.0.3"
} }

6
package-lock.json generated
View File

@@ -23,9 +23,9 @@
"integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==" "integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ=="
}, },
"ejs-render-remote": { "ejs-render-remote": {
"version": "1.0.2", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/ejs-render-remote/-/ejs-render-remote-1.0.2.tgz", "resolved": "https://registry.npmjs.org/ejs-render-remote/-/ejs-render-remote-1.0.3.tgz",
"integrity": "sha512-UeEyN/ss0i+VYNANB5DISi8rgRkiL+/+wIxeFtYiEWozmZpjr2bktR1yU5XxIF2FprA3ULY7U1cqsJ0Cj1F5LA==" "integrity": "sha512-5Tj0RGLQvBlpZdT1y1F/k7S4ayv9/WkljL/T2PiTJSh5NT4mgm2G+kPXYorfZyb4pomMqDc1vSo+VbLaaLHACg=="
}, },
"i18next": { "i18next": {
"version": "15.0.9", "version": "15.0.9",

2
package.json
View File

@@ -11,7 +11,7 @@
"dependencies": { "dependencies": {
"bootstrap": "^4.3.1", "bootstrap": "^4.3.1",
"ejs": "^2.6.1", "ejs": "^2.6.1",
"ejs-render-remote": "^1.0.2", "ejs-render-remote": "^1.0.3",
"i18next": "^15.0.9", "i18next": "^15.0.9",
"jquery": "^3.4.0", "jquery": "^3.4.0",
"page": "^1.11.4", "page": "^1.11.4",