Skip to content

Commit

Permalink
增加CONTENXT_PATH以便在gh-pages的内容能够被正确访问
Browse files Browse the repository at this point in the history
  • Loading branch information
felix committed May 8, 2016
1 parent 796e44a commit d806555
Show file tree
Hide file tree
Showing 9 changed files with 210 additions and 81 deletions.
File renamed without changes.
4 changes: 2 additions & 2 deletions form/dist/js/app/demo1.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ define(function (require, exports, module) {

//定义常量及组件初始化
var API = {
save: '/api/user/save'
save: 'api/user/save'
},
BUTTONS = {
SAVE: $('#btn-save')
Expand All @@ -21,7 +21,7 @@ define(function (require, exports, module) {
//业务逻辑
BUTTONS.SAVE.click(function(){
BUTTONS.SAVE.button('loading');
Ajax.post(API.save,appForm.getData()).done(function(res){
Ajax.post(Url.getUrl(API.save,appForm.getData())).done(function(res){
if(res.code == 200) {
alert('保存成功!');
} else {
Expand Down
36 changes: 0 additions & 36 deletions form/dist/js/app/index.js

This file was deleted.

33 changes: 0 additions & 33 deletions form/dist/js/app/mode_1.js

This file was deleted.

2 changes: 1 addition & 1 deletion form/dist/js/mod/url.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ define(function (require, exports, module) {
});
return obj;
})(),
baseUrl = location.protocol + '//' + location.hostname + (location.port == '' ? '' : (':' + location.port)) + '/' + '@@CONTEXT_PATH',
baseUrl = location.protocol + '//' + location.hostname + (location.port == '' ? '' : (':' + location.port)) + '/' + '',
_getUrl = function (url) {
return baseUrl + (url || '');
};
Expand Down
34 changes: 29 additions & 5 deletions form/gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
var gulp = require('gulp'),
yargs = require('yargs').argv,//获取运行gulp命令时附加的命令行参数
clean = require('gulp-clean'),//清理文件或文件夹
autoprefixer = require('gulp-autoprefixer'),//自动添加CSS3的前缀
less = require('gulp-less'),//编译less
replace = require('gulp-replace-task'),//对文件中的字符串进行替换
browserSync = require('browser-sync'),
src = 'src',
dist = 'dist';
dist = 'dist',
CONTEXT_PATH = 'blog/form/';

//清理
gulp.task('clean', function () {
Expand All @@ -22,6 +22,21 @@ gulp.task('static', function () {
.pipe(gulp.dest(dist));
});

//html
gulp.task('html', function () {
return gulp.src(src + '/html/**/*')
.pipe(replace({
patterns: [
{
match: 'CONTEXT_PATH',
replacement: yargs.r ? CONTEXT_PATH : ''
}
]
}))
.pipe(gulp.dest(dist + '/html/'));
});


//style
gulp.task('style', function () {
return gulp.src(src + '/css/**/*')
Expand All @@ -31,11 +46,19 @@ gulp.task('style', function () {
//scripts
gulp.task('script', function () {
return gulp.src(src + '/js/**/*')
.pipe(replace({
patterns: [
{
match: 'CONTEXT_PATH',
replacement: yargs.r ? CONTEXT_PATH : ''
}
]
}))
.pipe(gulp.dest(dist + '/js/'));
});

gulp.task('build', ['clean'], function () {
return gulp.start('style', 'script', 'static');
return gulp.start('style', 'script', 'static','html');
});

gulp.task('watch', function () {
Expand All @@ -56,7 +79,7 @@ gulp.task('server', function () {
}
},
port: yargs.p,
startPath: 'demo/index.html'
startPath: 'dist/html/demo1.html'
});
});

Expand All @@ -66,6 +89,7 @@ gulp.task('server', function () {
* -w: 监听文件改变
* -s: 启动browserAsync
* -p: 指定端口
* -r: 需要更新github上的demo时才会用到的参数
*
* 常用命令如下
* 构建:gulp
Expand Down
5 changes: 3 additions & 2 deletions form/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{
"private": true,
"dependencies": {
"browser-sync": "^2.9.11",
"gulp": "^3.9.1",
"gulp-autoprefixer": "^3.1.0",
"gulp-clean": "^0.3.2",
"gulp-less": "^3.0.5",
"browser-sync": "^2.9.11",
"gulp-replace-task": "^0.11.0",
"yargs": "^4.4.0"
},
"engines": {
"node": ">=0.10.0"
}
}
}
173 changes: 173 additions & 0 deletions form/src/html/demo1.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
<!DOCTYPE html>
<html lang="zh-CN">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="/@@CONTEXT_PATHdist/css/font-awesome.css"/>
<link rel="stylesheet" href="/@@CONTEXT_PATHdist/css/bootstrap.css"/>
<link rel="stylesheet" href="/@@CONTEXT_PATHdist/css/form.css"/>
<link rel="stylesheet" href="/@@CONTEXT_PATHdist/css/bootstrap-datepicker.css"/>
<style type="text/css">
.form-control[multiple] {
height: auto;
}

.form-edit .btn-toolbar {
padding-left: 210px;
}
</style>
<title>测试</title>
</head>
<body>
<form id="appForm" class="form-horizontal form-edit" autocomplete="off">
<input class="form-control form-field"
name="id"
data-type="text"
data-default-value=""
type="hidden"
placeholder=""
value="1">

<div class="form-group">
<label class="col-xs-2 control-label"><span class="required" title="必填">* </span>名字:</label>

<div class="col-xs-5">
<input class="form-control form-field"
name="name"
data-type="text"
data-default-value=""
type="text"
placeholder=""
value="felix">
</div>
</div>
<div class="form-group">
<label class="col-xs-2 control-label">生日:</label>

<div class="col-xs-5">
<input class="form-control form-field"
name="birthday"
data-type="date"
data-default-value=""
type="text"
placeholder=""
readonly
value="2000-01-01">
</div>
</div>
<div class="form-group">
<label class="col-xs-2 control-label">爱好:</label>

<div class="col-xs-5 checkbox checkbox-md form-field"
data-name="hobby"
data-type="checkbox"
data-default-value=""
data-value="电影,音乐">
<label>
<input type="checkbox" value="电影">
<i class="fa checked"></i>
电影
</label>
<label>
<input type="checkbox" value="音乐">
<i class="fa checked"></i>
音乐
</label>
<label>
<input type="checkbox" value="游戏">
<i class="fa checked"></i>
游戏
</label>
</div>
</div>
<div class="form-group">
<label class="col-xs-2 control-label">性别:</label>

<div class="col-xs-5 radio radio-md form-field"
data-name="gender"
data-type="radio"
data-default-value=""
data-value="">
<label>
<input type="radio" value="">
<i class="fa checked"></i>
</label>
<label>
<input type="radio" value="">
<i class="fa checked"></i>
</label>
</div>
</div>
<div class="form-group">
<label class="col-xs-2 control-label">职业:</label>

<div class="col-xs-5">
<select class="form-control form-field"
name="work"
data-type="select"
data-default-value=""
data-value="UI设计">
<option value="">请选择职业</option>
<option value="前端开发">前端开发</option>
<option value="UI设计">UI设计</option>
<option value="JAVA后端">JAVA后端</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-xs-2 control-label">行业:</label>

<div class="col-xs-5">
<select class="form-control form-field"
name="industry"
data-type="select"
multiple
data-default-value=""
data-value="电子商务,互联网">
<option value="">请选择行业(可多选)</option>
<option value="电子商务">电子商务</option>
<option value="互联网">互联网</option>
<option value="电子通信">电子通信</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-xs-2 control-label">简介:</label>

<div class="col-xs-5">
<textarea class="form-control form-field"
name="desc"
data-type="text"
data-default-value=""
rows="3"
placeholder="">felix</textarea>
</div>
</div>
<div class="form-group">
<label class="col-xs-2 control-label">详细介绍:</label>

<div class="col-xs-10">
<textarea class="form-control form-field"
name="detailDesc"
data-type="ueditor"
data-default-value=""
rows="3"
placeholder=""><p>I'm felix.</p></textarea>
</div>
</div>
<div class="btn-toolbar">
<button id="btn-save" data-loading-text="保存中..." type="button" class="btn btn-form btn-primary">保存</button>
</div>
</form>
<script type="text/javascript" src="/@@CONTEXT_PATHdist/lib/ueditor/ueditor.config.js"></script>
<script type="text/javascript" src="/@@CONTEXT_PATHdist/lib/ueditor/ueditor.all.js"></script>
<script src="/@@CONTEXT_PATHdist/js/lib/sea.js"></script>
<script src="/@@CONTEXT_PATHdist/js/common.js"></script>
<script>
seajs.use('/@@CONTEXT_PATHdist/js/app/demo1.js');
</script>
</body>
</html>
4 changes: 2 additions & 2 deletions form/src/js/app/demo1.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ define(function (require, exports, module) {

//定义常量及组件初始化
var API = {
save: '/api/user/save'
save: 'api/user/save'
},
BUTTONS = {
SAVE: $('#btn-save')
Expand All @@ -21,7 +21,7 @@ define(function (require, exports, module) {
//业务逻辑
BUTTONS.SAVE.click(function(){
BUTTONS.SAVE.button('loading');
Ajax.post(API.save,appForm.getData()).done(function(res){
Ajax.post(Url.getUrl(API.save,appForm.getData())).done(function(res){
if(res.code == 200) {
alert('保存成功!');
} else {
Expand Down

0 comments on commit d806555

Please sign in to comment.