Skip to content

Fix IE 7 compability #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 9, 2015
Merged

Fix IE 7 compability #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dd2a97
Fix IE 7 compability
codedogfish Dec 9, 2015
cc5c8df
Enhance the logger
codedogfish Dec 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .jshintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@
"devel": true, // globals that are usually used for logging poor-man's debugging: console, alert, etc.
"jquery": true, // jquery library

"node": true
"node": true,
"evil": true
}
2 changes: 0 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
language: node_js
node_js:
- "0.12"
- "iojs"
- "iojs-v1.0.4"
cache:
directories:
- node_modules
Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"tests"
],
"dependencies": {
"plupload": "~2.1.8"
"plupload": "=2.1.1"
},
"devDependencies": {
"bootstrap": "~3.3.6",
Expand Down
4 changes: 2 additions & 2 deletions demo/config.js.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ module.exports = {
'SECRET_KEY': '<Your Secret Key>',
'Bucket_Name': '<Your Bucket Name>',
'Port': 19110,
'Uptoken_Url': '/uptoken',
'Uptoken_Url': 'uptoken',
'Domain': 'http://qiniu-plupload.qiniudn.com/'
};
};
7 changes: 4 additions & 3 deletions demo/scripts/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ $(function() {
browse_button: 'pickfiles',
container: 'container',
drop_element: 'container',
max_file_size: '100mb',
flash_swf_url: 'js/plupload/Moxie.swf',
max_file_size: '1000mb',
flash_swf_url: 'bower_components/plupload/js/Moxie.swf',
dragdrop: true,
chunk_size: '4mb',
uptoken_url: $('#uptoken_url').val(),
Expand All @@ -29,6 +29,7 @@ $(function() {
// },
// },
auto_start: true,
log_level: 5,
init: {
'FilesAdded': function(up, files) {
$('table').show();
Expand Down Expand Up @@ -217,7 +218,7 @@ $(function() {
var newUrl = Qiniu.pipeline(fopArr, key);

var newImg = new Image();
img.attr('src', '/images/loading.gif');
img.attr('src', 'images/loading.gif');
newImg.onload = function() {
img.attr('src', newUrl);
img.parent('a').attr('href', newUrl);
Expand Down
2 changes: 1 addition & 1 deletion demo/scripts/multiple.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ $(function() {
var newUrl = Qiniu.pipeline(fopArr, key);

var newImg = new Image();
img.attr('src', '/images/loading.gif');
img.attr('src', 'images/loading.gif');
newImg.onload = function() {
img.attr('src', newUrl);
img.parent('a').attr('href', newUrl);
Expand Down
6 changes: 3 additions & 3 deletions demo/scripts/ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,12 +234,12 @@ FileProgress.prototype.setComplete = function(up, info) {
var Wrapper = $('<div class="Wrapper"/>');
var imgWrapper = $('<div class="imgWrapper col-md-3"/>');
var linkWrapper = $('<a class="linkWrapper" target="_blank"/>');
var showImg = $('<img src="/images/loading.gif"/>');
var showImg = $('<img src="images/loading.gif"/>');

progressNameTd.append(Wrapper);

if (!isImg) {
showImg.attr('src', '/images/default.png');
showImg.attr('src', 'images/default.png');
Wrapper.addClass('default');

imgWrapper.append(showImg);
Expand Down Expand Up @@ -268,7 +268,7 @@ FileProgress.prototype.setComplete = function(up, info) {
$('#myModal-img').find('.text-warning').show();
}
var newImg = new Image();
modalBody.find('img').attr('src', '/images/loading.gif');
modalBody.find('img').attr('src', 'images/loading.gif');
newImg.onload = function() {
modalBody.find('img').attr('src', url).data('key', key).data('h', height);
modalBody.find('.modal-body-wrapper').find('a').attr('href', url);
Expand Down
70 changes: 35 additions & 35 deletions demo/views/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>七牛云存储 - JavaScript SDK</title>
<link href="/images/favicon.ico" rel="shortcut icon">
<link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.css">
<meta charset="UTF-8">
<title>七牛云存储 - JavaScript SDK</title>
<link href="images/favicon.ico" rel="shortcut icon">
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css">
<link rel="stylesheet" href="styles/main.css">
<link rel="stylesheet" href="styles/highlight.css">
<link rel="stylesheet" href="styles/main.css">

<!--[if lt IE 9]>
<script src="/bower_components/js/Respond-1.4.2/respond.min.js"></script>
<!--[if lt IE 9]>
<script src="bower_components/respond/dest/respond.min.js"></script>
<![endif]-->
</head>
<body>
<div class="container">
<div class="text-left col-md-12 wrapper">
<h1 class="text-left col-md-12 ">
七牛云存储 - JavaScript SDK
<div class="text-left col-md-12 wrapper">
<h1 class="text-left col-md-12 ">
七牛云存储 - JavaScript SDK
<a class="btn btn-default view_code" id="show_code">
查看初始化代码
</a>
<a class="btn btn-default view_github" href="https://github.com/qiniupd/qiniu-js-sdk" target="_blank">
<img src="http://qtestbucket.qiniudn.com/GitHub-Mark-32px.png">
View Source on Github
</a>
</h1>
<img src="http://qtestbucket.qiniudn.com/GitHub-Mark-32px.png">
View Source on Github
</a>
</h1>
<input type="hidden" id="domain" value="<%= domain %>">
<input type="hidden" id="uptoken_url" value="<%= uptoken_url %>">
<ul class="tip col-md-12 text-mute">
<li>
<small>
JavaScript SDK 基于 Plupload 开发，可以通过 Html5 或 Flash 等模式上传文件至七牛云存储。
</small>
</li>
<li>
<small>临时上传的空间不定时清空，请勿保存重要文件。</small>
</li>
<ul class="tip col-md-12 text-mute">
<li>
<small>
JavaScript SDK 基于 Plupload 开发，可以通过 Html5 或 Flash 等模式上传文件至七牛云存储。
</small>
</li>
<li>
<small>临时上传的空间不定时清空，请勿保存重要文件。</small>
</li>
<li>
<small>Html5模式大于4M文件采用分块上传。</small>
</li>
<li>
<small>上传图片可查看处理效果。</small>
</li>
<li>
<small>本示例限制最大上传文件100M。</small>
</li>
</ul>
<li>
<small>本示例限制最大上传文件100M。</small>
</li>
</ul>
</div>
<div class="body">
<div class="col-md-12">
Expand Down Expand Up @@ -235,13 +235,13 @@ <h4 class="modal-title" id="myModalLabel">图片效果查看</h4>



<script type="text/javascript" src="/bower_components/jquery/jquery.min.js"></script>
<script type="text/javascript" src="/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="/bower_components/plupload/js/plupload.full.min.js"></script>
<script type="text/javascript" src="/bower_components/plupload/js/i18n/zh_CN.js"></script>
<script type="text/javascript" src="/src/qiniu.js"></script>
<script type="text/javascript" src="/scripts/ui.js"></script>
<script type="text/javascript" src="/scripts/highlight.js"></script>
<script type="text/javascript" src="/scripts/main.js"></script>
<script type="text/javascript" src="bower_components/jquery/jquery.min.js"></script>
<script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="bower_components/plupload/js/plupload.full.min.js"></script>
<script type="text/javascript" src="bower_components/plupload/js/i18n/zh_CN.js"></script>
<script type="text/javascript" src="scripts/ui.js"></script>
<script type="text/javascript" src="src/qiniu.js"></script>
<script type="text/javascript" src="scripts/highlight.js"></script>
<script type="text/javascript" src="scripts/main.js"></script>
</body>
</html>
Loading