Skip to content
This repository was archived by the owner on Aug 12, 2020. It is now read-only.

8.5.0 to 8.8.2 #37

Merged
merged 10 commits into from
Aug 25, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion fileupload/static/css/bootstrap-ie6.min.css

This file was deleted.

9 changes: 0 additions & 9 deletions fileupload/static/css/bootstrap-responsive.min.css

This file was deleted.

9 changes: 0 additions & 9 deletions fileupload/static/css/bootstrap.min.css

This file was deleted.

21 changes: 21 additions & 0 deletions fileupload/static/css/demo-ie8.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
@charset "UTF-8";
/*
* jQuery File Upload Demo CSS Fixes for IE<9 1.0.0
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2013, Sebastian Tschan
* https://blueimp.net
*
* Licensed under the MIT license:
* http://www.opensource.org/licenses/MIT
*/

.navigation {
list-style: none;
padding: 0;
margin: 1em 0;
}
.navigation li {
display: inline;
margin-right: 10px;
}
67 changes: 67 additions & 0 deletions fileupload/static/css/demo.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
@charset "UTF-8";
/*
* jQuery File Upload Demo CSS 1.0.2
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2013, Sebastian Tschan
* https://blueimp.net
*
* Licensed under the MIT license:
* http://www.opensource.org/licenses/MIT
*/

body {
max-width: 750px;
margin: 0 auto;
padding: 1em;
font-family: 'Lucida Grande', 'Lucida Sans Unicode', Arial, sans-serif;
font-size: 1em;
line-height: 1.4em;
background: #222;
color: #fff;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
}
a {
color: orange;
text-decoration: none;
}
img {
border: 0;
vertical-align: middle;
}
h1 {
line-height: 1em;
}
blockquote {
padding: 0 0 0 15px;
margin: 0 0 20px;
border-left: 5px solid #eee;
}
table {
width: 100%;
margin: 10px 0;
}

.fileupload-progress {
margin: 10px 0;
}
.fileupload-progress .progress-extended {
margin-top: 5px;
}
.error {
color: red;
}

@media (min-width: 481px) {
.navigation {
list-style: none;
padding: 0;
}
.navigation li {
display: inline-block;
}
.navigation li:not(:first-child):before {
content: '| ';
}
}
54 changes: 19 additions & 35 deletions fileupload/static/css/jquery.fileupload-ui.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@charset 'UTF-8';
@charset "UTF-8";
/*
* jQuery File Upload UI Plugin CSS 6.3
* jQuery File Upload UI Plugin CSS 8.8.1
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2010, Sebastian Tschan
Expand All @@ -13,72 +13,56 @@
.fileinput-button {
position: relative;
overflow: hidden;
float: left;
margin-right: 4px;
}
.fileinput-button input {
position: absolute;
top: 0;
right: 0;
margin: 0;
border: solid transparent;
border-width: 0 0 100px 200px;
opacity: 0;
filter: alpha(opacity=0);
-moz-transform: translate(-300px, 0) scale(4);
transform: translate(-300px, 0) scale(4);
font-size: 23px;
direction: ltr;
cursor: pointer;
}
.fileupload-buttonbar .btn,
.fileupload-buttonbar .toggle {
margin-bottom: 5px;
}
.files .progress {
width: 200px;
}
.progress-animated .progress-bar,
.progress-animated .bar {
background: url(../img/progressbar.gif) !important;
filter: none;
}
.fileupload-loading {
position: absolute;
left: 50%;
width: 128px;
height: 128px;
float: right;
width: 32px;
height: 32px;
background: url(../img/loading.gif) center no-repeat;
background-size: contain;
display: none;
}
.fileupload-processing .fileupload-loading {
display: block;
}

/* Fix for IE 6: */
*html .fileinput-button {
line-height: 22px;
margin: 1px -3px 0 0;
.files audio,
.files video {
max-width: 300px;
}

/* Fix for IE 7: */
*+html .fileinput-button {
margin: 1px 0 0 0;
}

@media (max-width: 480px) {
@media (max-width: 767px) {
.fileupload-buttonbar .toggle,
.files .toggle,
.files .btn span {
display: none;
}
.files .preview * {
width: 40px;
}
.files .name * {
.files .name {
width: 80px;
display: inline-block;
word-wrap: break-word;
}
.files .progress {
width: 20px;
}
.files .delete {
width: 60px;
.files audio,
.files video {
max-width: 80px;
}
}
20 changes: 16 additions & 4 deletions fileupload/static/css/style.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
body{
padding-top: 60px;
@charset "UTF-8";
/*
* jQuery File Upload Plugin CSS Example 8.8.2
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2013, Sebastian Tschan
* https://blueimp.net
*
* Licensed under the MIT license:
* http://www.opensource.org/licenses/MIT
*/

body {
padding-top: 60px;
}

.preview img {
max-height: 50px;
}
max-height:50px;
}
Binary file removed fileupload/static/img/glyphicons-halflings-white.png
Binary file not shown.
Binary file removed fileupload/static/img/glyphicons-halflings.png
Binary file not shown.
Binary file added fileupload/static/img/progressbar.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
106 changes: 106 additions & 0 deletions fileupload/static/js/app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
/*
* jQuery File Upload Plugin Angular JS Example 1.2.1
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2013, Sebastian Tschan
* https://blueimp.net
*
* Licensed under the MIT license:
* http://www.opensource.org/licenses/MIT
*/

/*jslint nomen: true, regexp: true */
/*global window, angular */

(function () {
'use strict';


var isOnGitHub = window.location.hostname === 'blueimp.github.io',
url = '/upload/angular/',
urlview = '/upload/view/';

angular.module('demo', [
'blueimp.fileupload'
])
.config([
'$httpProvider', 'fileUploadProvider',
function ($httpProvider, fileUploadProvider) {
delete $httpProvider.defaults.headers.common['X-Requested-With'];
fileUploadProvider.defaults.redirect = window.location.href.replace(
/\/[^\/]*$/,
'/cors/result.html?%s'
);

if (isOnGitHub) {
// Demo settings:
angular.extend(fileUploadProvider.defaults, {
// Enable image resizing, except for Android and Opera,
// which actually support image resizing, but fail to
// send Blob objects via XHR requests:
disableImageResize: /Android(?!.*Chrome)|Opera/
.test(window.navigator.userAgent),
maxFileSize: 5000000,
acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i
});
}
}
])

.controller('DemoFileUploadController', [
'$scope', '$http', '$filter', '$window',
function ($scope, $http) {
$scope.options = {
url: url
};
if (!isOnGitHub) {
$scope.loadingFiles = true;
$http.get(urlview)
.then(
function (response) {
$scope.loadingFiles = false;
$scope.queue = response.data.files || [];
},
function () {
$scope.loadingFiles = false;
}
);
}
}
])

.controller('FileDestroyController', [
'$scope', '$http',
function ($scope, $http) {
var file = $scope.file,
state;
if (file.url) {
file.$state = function () {
return state;
};
file.$destroy = function () {
state = 'pending';
return $http({
url: file.deleteUrl,
method: file.deleteType,
xsrfHeaderName: 'X-CSRFToken',
xsrfCookieName: 'csrftoken'
}).then(
function () {
state = 'resolved';
$scope.clear(file);
},
function () {
state = 'rejected';
}
);
};
} else if (!file.$cancel && !file._index) {
file.$cancel = function () {
$scope.clear(file);
};
}
}
]);

}());
7 changes: 6 additions & 1 deletion fileupload/static/js/bootstrap.min.js

Large diffs are not rendered by default.

Loading