fixed bug
This commit is contained in:
1 parent
c08b698397
commit
fc44782dce
5 files changed
+22
-21
No files matched your search
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "webpage",
|
"name": "webpage",
|
||||||
"version": "1.0.0",
|
"version": "1.1.2",
|
||||||
"description": "web pages",
|
"description": "web pages",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
<h1>邓统宇</h1>
|
<h1>邓统宇</h1>
|
||||||
</div>
|
</div>
|
||||||
<div class="msg-row">
|
<div class="msg-row">
|
||||||
<p>世界纷纷扰扰,我只想做一个安静的“攻城狮”!!</p>
|
<p>世界纷纷扰扰,我只想做一个安静的“攻城狮”!</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="msg-row">
|
<div class="msg-row">
|
||||||
<p>web前端开发工程师</p>
|
<p>web前端开发工程师</p>
|
||||||
|
|||||||
+15
-15
@@ -9,22 +9,22 @@ require('../../script/lib/svg3dtagcloud');
|
|||||||
|
|
||||||
require('../../script/lib/touchSwipe');
|
require('../../script/lib/touchSwipe');
|
||||||
|
|
||||||
const pop = require('../../script/tmodjs/resume/pop');
|
var pop = require('../../script/tmodjs/resume/pop');
|
||||||
|
|
||||||
let scrolling = false;
|
var scrolling = false;
|
||||||
|
|
||||||
let pos = 0;
|
var pos = 0;
|
||||||
|
|
||||||
let list = $('section');
|
var list = $('section');
|
||||||
|
|
||||||
let svgObject = false;
|
var svgObject = false;
|
||||||
|
|
||||||
//let hasTouch = 'ontouchstart' in window;
|
//var hasTouch = 'ontouchstart' in window;
|
||||||
|
|
||||||
let isMobile = false;
|
var isMobile = false;
|
||||||
|
|
||||||
let cssSupports = (function() {
|
var cssSupports = (function() {
|
||||||
let div = document.createElement('div');
|
var div = document.createElement('div');
|
||||||
|
|
||||||
return function(prop) {
|
return function(prop) {
|
||||||
if ( prop in div.style ) return true;
|
if ( prop in div.style ) return true;
|
||||||
@@ -33,14 +33,14 @@ let cssSupports = (function() {
|
|||||||
};
|
};
|
||||||
})();
|
})();
|
||||||
|
|
||||||
let ua = navigator.userAgent.toLowerCase();
|
var ua = navigator.userAgent.toLowerCase();
|
||||||
|
|
||||||
if(ua.match(/(iphone|ipod|android|ios)/i)) {
|
if(ua.match(/(iphone|ipod|android|ios)/i)) {
|
||||||
isMobile = true;
|
isMobile = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!cssSupports('order')){
|
if(!cssSupports('order')){
|
||||||
let popDom = $(pop({browser:'浏览器'}));
|
var popDom = $(pop({browser:'浏览器'}));
|
||||||
$('body').append(popDom);
|
$('body').append(popDom);
|
||||||
|
|
||||||
if(isMobile) {
|
if(isMobile) {
|
||||||
@@ -108,7 +108,7 @@ function navigateDown() {
|
|||||||
function slidePage(isNext) {
|
function slidePage(isNext) {
|
||||||
scrolling = true;
|
scrolling = true;
|
||||||
list.css({display:'none'});
|
list.css({display:'none'});
|
||||||
// let prev = getPrev(pos);
|
// var prev = getPrev(pos);
|
||||||
// list.eq(prev).addClass('fadeOutUp');
|
// list.eq(prev).addClass('fadeOutUp');
|
||||||
// list.eq(prev).one("animationend", onOutAnimationend);
|
// list.eq(prev).one("animationend", onOutAnimationend);
|
||||||
list.eq(pos).one("animationend", onInAnimationend);
|
list.eq(pos).one("animationend", onInAnimationend);
|
||||||
@@ -157,9 +157,9 @@ function getNext(p) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function setTagCloud() {
|
function setTagCloud() {
|
||||||
let curElement = $('#skill');
|
var curElement = $('#skill');
|
||||||
|
|
||||||
let entries = [
|
var entries = [
|
||||||
{ label: 'HTML5',url: 'javascript:void(0);',target: ''},
|
{ label: 'HTML5',url: 'javascript:void(0);',target: ''},
|
||||||
{ label: 'CSS3',url: 'javascript:void(0);',target: ''},
|
{ label: 'CSS3',url: 'javascript:void(0);',target: ''},
|
||||||
{ label: 'JavaScript',url: 'javascript:void(0);',target: ''},
|
{ label: 'JavaScript',url: 'javascript:void(0);',target: ''},
|
||||||
@@ -181,7 +181,7 @@ function setTagCloud() {
|
|||||||
{ label: 'WordPress',url: 'javascript:void(0);',target: ''}
|
{ label: 'WordPress',url: 'javascript:void(0);',target: ''}
|
||||||
];
|
];
|
||||||
|
|
||||||
let settings = {
|
var settings = {
|
||||||
entries: entries,
|
entries: entries,
|
||||||
width: '100%',
|
width: '100%',
|
||||||
height: '100%',
|
height: '100%',
|
||||||
|
|||||||
+4
-3
@@ -92,6 +92,7 @@ init = (pathName) => {
|
|||||||
filename: 'index.js',
|
filename: 'index.js',
|
||||||
}
|
}
|
||||||
}))
|
}))
|
||||||
|
//.pipe(webpack( require('./webpack.config.js')(pathConfig.scriptBuildPath) ))
|
||||||
.pipe(gulp.dest(pathConfig.babelOutPath))
|
.pipe(gulp.dest(pathConfig.babelOutPath))
|
||||||
.on("end", reload);
|
.on("end", reload);
|
||||||
});
|
});
|
||||||
@@ -174,7 +175,7 @@ init = (pathName) => {
|
|||||||
|
|
||||||
|
|
||||||
gulp.task('build', function() {
|
gulp.task('build', function() {
|
||||||
runSequence('stylus_build', 'swig_build', 'htmlmin_build', 'tmod_build', 'babel_build', 'uglify_build',function() {
|
runSequence('stylus_build', 'swig_build', 'htmlmin_build', 'tmod_build', 'babel_build', 'uglify_build', function() {
|
||||||
console.log(chalk.green.bold(pathName + ' 打包完成!'));
|
console.log(chalk.green.bold(pathName + ' 打包完成!'));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -201,7 +202,7 @@ copyTpl = (pathName) => {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
exports.selectTpl = (pathName,type) => {
|
exports.selectTpl = (pathName, type) => {
|
||||||
copyTpl(pathName);
|
copyTpl(pathName);
|
||||||
if (type == 1) {
|
if (type == 1) {
|
||||||
runSequence('copy-pc', function() {
|
runSequence('copy-pc', function() {
|
||||||
@@ -221,7 +222,7 @@ exports.selectTpl = (pathName,type) => {
|
|||||||
exports.dev = (pathName) => {
|
exports.dev = (pathName) => {
|
||||||
init(pathName);
|
init(pathName);
|
||||||
runSequence('dev');
|
runSequence('dev');
|
||||||
watch.init(util.getPathConfig(),gulp);
|
watch.init(util.getPathConfig(), gulp);
|
||||||
}
|
}
|
||||||
|
|
||||||
exports.pack = (pathName) => {
|
exports.pack = (pathName) => {
|
||||||
|
|||||||
+1
-1
@@ -34,7 +34,7 @@ exports.initPath = (pathName) => {
|
|||||||
_pathConfig.babelOutPath = _config.build + '/pages/' + pathName;
|
_pathConfig.babelOutPath = _config.build + '/pages/' + pathName;
|
||||||
|
|
||||||
//uglify build目录
|
//uglify build目录
|
||||||
_pathConfig.uglifyBuildPath = _config.build + '/pages/' + pathName + '/**/*.js';
|
_pathConfig.uglifyBuildPath = _config.build + '/pages/' + pathName + '/index.js';
|
||||||
|
|
||||||
//tmod build目录
|
//tmod build目录
|
||||||
_pathConfig.tmodBuildPath = _config.base + '/pages/' + pathName + '/**/*.tmod';
|
_pathConfig.tmodBuildPath = _config.base + '/pages/' + pathName + '/**/*.tmod';
|
||||||
|
|||||||
Reference in new issue
Block a user