Skip to content

Commit 5243bb5

Browse files
committed
Template working again.
1 parent c7d02ec commit 5243bb5

File tree

5 files changed

+202
-199
lines changed

5 files changed

+202
-199
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cordova-template-framework7-vue-webpack",
3-
"version": "1.2.0",
3+
"version": "1.2.1",
44
"description": "Cordova template with framework7, vue 2 and webpack 2.",
55
"main": "index.js",
66
"scripts": {

template_src/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
"current-device": "^0.6.0",
1818
"epipebomb": "^1.0.0",
1919
"extract-text-webpack-plugin": "^3.0.0",
20-
"file-loader": "^0.11.2",
21-
"html-loader": "^0.4.5",
20+
"file-loader": "^1.1.5",
21+
"html-loader": "^0.5.1",
2222
"html-webpack-plugin": "^2.28.0",
2323
"node-sass": "^4.5.0",
2424
"path": "^0.12.7",
2525
"sass-loader": "^6.0.3",
26-
"style-loader": "^0.18.2",
26+
"style-loader": "^0.19.0",
2727
"svg-url-loader": "^2.0.2",
28-
"uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony-v2.8.22",
29-
"uglifyjs-webpack-plugin": "^0.4.6",
30-
"url-loader": "^0.5.8",
28+
"uglify-js": "^3.2.0",
29+
"uglifyjs-webpack-plugin": "^1.1.1",
30+
"url-loader": "^0.6.2",
3131
"vue-hot-reload-api": "^2.0.11",
3232
"vue-html-loader": "^1.2.4",
3333
"vue-loader": "^12.2.2",
@@ -37,7 +37,7 @@
3737
"webpack-dev-server": "^2.4.1"
3838
},
3939
"dependencies": {
40-
"framework7": "^1.5.4",
40+
"framework7": "^1.6.5",
4141
"framework7-vue": "^0.9.2",
4242
"loglevel": "^1.4.1",
4343
"vue": "^2.2.4"
Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
1-
const deviceJs = require('current-device').default
1+
const deviceJs = require('current-device').default;
22

33
function bodyPrepend(platform) {
4-
let body = document.querySelector("body"),
5-
script = document.createElement("script")
6-
7-
script.onload = function () {
8-
console.log("Cordova script loaded!")
9-
}
10-
11-
script.src = `platform_cordova_files/${platform}/cordova.js`
12-
body.appendChild(script)
13-
14-
15-
console.log(`${platform} platform cordova.js injected.`)
4+
let body = document.querySelector("body"),
5+
script = document.createElement("script");
6+
7+
script.onload = function () {
8+
console.log("Cordova script loaded!");
9+
};
10+
11+
script.src = `platform_cordova_files/${platform}/cordova.js`;
12+
body.appendChild(script);
13+
14+
15+
console.log(`${platform} platform cordova.js injected.`);
1616
}
1717

18-
if (deviceJs.desktop())
19-
bodyPrepend("browser")
20-
else if (deviceJs.android())
21-
bodyPrepend("android")
18+
if (deviceJs.android())
19+
bodyPrepend("android");
2220
else if (deviceJs.ios())
23-
bodyPrepend("ios")
21+
bodyPrepend("ios");
2422
else
25-
alert("Platform not found!")
23+
bodyPrepend("browser");

0 commit comments

Comments
 (0)