diff --git a/demo/config.js b/demo/config.js index 77df72a1..d5baae05 100644 --- a/demo/config.js +++ b/demo/config.js @@ -2,5 +2,7 @@ module.exports = { 'ACCESS_KEY': '', 'SECRET_KEY': '', 'Bucket_Name': '', - 'Port': 18080 + 'Port': 18080, + 'Uptoken_Url': '/token', + 'Domain': 'http://qiniu-plupload.qiniudn.com/' } diff --git a/demo/js/main.js b/demo/js/main.js index 4597dcec..4f4eb6ea 100644 --- a/demo/js/main.js +++ b/demo/js/main.js @@ -3,77 +3,76 @@ /*global FileProgress */ /*global hljs */ -var uploader = Qiniu.uploader({ - runtimes: 'html5,flash,html4', - browse_button: 'pickfiles', - container: 'container', - drop_element: 'container', - max_file_size: '100mb', - flash_swf_url: 'js/plupload/Moxie.swf', - dragdrop: true, - chunk_size: '4mb', - uptoken_url: '/token', - domain: 'http://qiniu-plupload.qiniudn.com/', - // unique_names: true, - // save_key: true, - // x_vars: { - // 'id': '1234', - // 'time': function(up, file) { - // var time = (new Date()).getTime(); - // // do something with 'time' - // return time; - // }, - // }, - auto_start: true, - init: { - 'FilesAdded': function(up, files) { - $('table').show(); - $('#success').hide(); - plupload.each(files, function(file) { +$(function() { + var uploader = Qiniu.uploader({ + runtimes: 'html5,flash,html4', + browse_button: 'pickfiles', + container: 'container', + drop_element: 'container', + max_file_size: '100mb', + flash_swf_url: 'js/plupload/Moxie.swf', + dragdrop: true, + chunk_size: '4mb', + uptoken_url: $('#uptoken_url').val(), + domain: $('#domain').val(), + // unique_names: true, + // save_key: true, + // x_vars: { + // 'id': '1234', + // 'time': function(up, file) { + // var time = (new Date()).getTime(); + // // do something with 'time' + // return time; + // }, + // }, + auto_start: true, + init: { + 'FilesAdded': function(up, files) { + $('table').show(); + $('#success').hide(); + plupload.each(files, function(file) { + var progress = new FileProgress(file, 'fsUploadProgress'); + progress.setStatus("等待..."); + }); + }, + 'BeforeUpload': function(up, file) { var progress = new FileProgress(file, 'fsUploadProgress'); - progress.setStatus("等待..."); - }); - }, - 'BeforeUpload': function(up, file) { - var progress = new FileProgress(file, 'fsUploadProgress'); - var chunk_size = plupload.parseSize(this.getOption('chunk_size')); - if (up.runtime === 'html5' && chunk_size) { - progress.setChunkProgess(chunk_size); + var chunk_size = plupload.parseSize(this.getOption('chunk_size')); + if (up.runtime === 'html5' && chunk_size) { + progress.setChunkProgess(chunk_size); + } + }, + 'UploadProgress': function(up, file) { + var progress = new FileProgress(file, 'fsUploadProgress'); + var chunk_size = plupload.parseSize(this.getOption('chunk_size')); + progress.setProgress(file.percent + "%", up.total.bytesPerSec, chunk_size); + + }, + 'UploadComplete': function() { + $('#success').show(); + }, + 'FileUploaded': function(up, file, info) { + var progress = new FileProgress(file, 'fsUploadProgress'); + progress.setComplete(up, info); + }, + 'Error': function(up, err, errTip) { + $('table').show(); + var progress = new FileProgress(err.file, 'fsUploadProgress'); + progress.setError(); + progress.setStatus(errTip); } - }, - 'UploadProgress': function(up, file) { - var progress = new FileProgress(file, 'fsUploadProgress'); - var chunk_size = plupload.parseSize(this.getOption('chunk_size')); - progress.setProgress(file.percent + "%", up.total.bytesPerSec, chunk_size); - - }, - 'UploadComplete': function() { - $('#success').show(); - }, - 'FileUploaded': function(up, file, info) { - var progress = new FileProgress(file, 'fsUploadProgress'); - progress.setComplete(up, info); - }, - 'Error': function(up, err, errTip) { - $('table').show(); - var progress = new FileProgress(err.file, 'fsUploadProgress'); - progress.setError(); - progress.setStatus(errTip); + // , + // 'Key': function(up, file) { + // var key = ""; + // // do something with key + // return key + // } } - // , - // 'Key': function(up, file) { - // var key = ""; - // // do something with key - // return key - // } - } -}); - -uploader.bind('FileUploaded', function() { - console.log('hello man,a file is uploaded'); -}); + }); -$(function() { + uploader.bind('FileUploaded', function() { + console.log('hello man,a file is uploaded'); + }); $('#container').on( 'dragenter', function(e) { diff --git a/demo/server.js b/demo/server.js index 0c57c2a8..8e953f38 100644 --- a/demo/server.js +++ b/demo/server.js @@ -7,6 +7,10 @@ app.configure(function() { app.use(express.static(__dirname + '/')); }); +app.set('views', __dirname + '/views'); +app.engine('html', require('ejs').renderFile); + + app.use(function(req, res, next) { req.headers['if-none-match'] = 'no-match-for-this'; next(); @@ -20,13 +24,15 @@ app.get('/token', function(req, res, next) { if (token) { res.json({ uptoken: token - }) + }); } }); app.get('/', function(req, res) { - res.setHeader('Pragma', 'no-cache'); - res.sendfile(__dirname + '/index.html') + res.render('index.html', { + domain: config.Domain, + uptoken_url: config.Uptoken_Url + }); }); qiniu.conf.ACCESS_KEY = config.ACCESS_KEY; diff --git a/demo/index.html b/demo/views/index.html similarity index 98% rename from demo/index.html rename to demo/views/index.html index 198c751d..5d534128 100644 --- a/demo/index.html +++ b/demo/views/index.html @@ -25,6 +25,8 @@

View Source on Github

+ +
  • @@ -91,7 +93,7 @@ uptoken_url: '/token', //Ajax请求upToken的Url，**强烈建议设置**（服务端提供） // uptoken : '', //若未指定uptoken_url,则必须指定 uptoken ,uptoken由其他程序生成 // unique_names: true, // 默认 false，key为文件名。若开启该选项，SDK为自动生成上传成功后的key（文件名）。 - // save_key: true, // 默认 false。若在服务端生成uptoken的上传策略中指定了 `sava_key`，则开启，SDK会忽略对key的处理 + // save_key: true, // 默认 false。若在服务端生成uptoken的上传策略中指定了 `sava_key`，则开启，SDK会忽略对key的处理 domain: 'http://qiniu-plupload.qiniudn.com/', //bucket 域名，下载资源时用到，**必需** container: 'container', //上传区域DOM ID，默认是browser_button的父元素， max_file_size: '100mb', //最大文件体积限制 diff --git a/package.json b/package.json index ad0a112c..6cf63403 100644 --- a/package.json +++ b/package.json @@ -8,5 +8,6 @@ "dependencies": { "express": "~3.4.7", "qiniu": "~6.1.1" + "ejs": "~1.0.0" } }