Skip to content
This repository has been archived by the owner on Nov 20, 2018. It is now read-only.

Commit

Permalink
chore(merge): fixes after merging in develop branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@rnicholus
rnicholus committed Feb 27, 2015
1 parent f292c1d commit 7907d31
Show file tree
Hide file tree
Showing 2 changed files with 141 additions and 141 deletions.
276 changes: 138 additions & 138 deletions test/dev/devenv.js
View file
Expand Up @@ -6,70 +6,71 @@ qq(window).attach("load", function() {
},
azureUploader, s3Uploader, manualUploader, validatingUploader, failingUploader;

if (qq.supportedFeatures.ajaxUploading) {
azureUploader = new qq.azure.FineUploader({
element: document.getElementById("azure-example"),
debug: true,
request: {
endpoint: "http://fineuploaderdev2.blob.core.windows.net/dev"
},
cors: {
expected: true
},
signature: {
endpoint: "http://192.168.56.101:8080/sas"
},
uploadSuccess: {
endpoint: "http://192.168.56.101:8080/success"
},
chunking: {
enabled: true,
concurrent: {
enabled: true
}
},
resume: {
manualUploader = new qq.FineUploader({
element: document.getElementById("manual-example"),
autoUpload: false,
debug: true,
uploadButtonText: "Select Files",
display: {
fileSizeOnSubmit: true
},
request: {
endpoint: "/test/dev/handlers/traditional/endpoint.php"
},
deleteFile: {
enabled: true,
endpoint: "/test/dev/handlers/traditional/endpoint.php",
forceConfirm: true,
params: {
foo: "bar"
}
},
chunking: {
enabled: true,
concurrent: {
enabled: true
},
retry: {
enableAuto: true,
showButton: true
},
deleteFile: {
enabled: true,
forceConfirm: true
},
display: {
fileSizeOnSubmit: true
},
paste: {
targetElement: document,
promptForName: true
success: {
endpoint: "/test/dev/handlers/traditional/endpoint.php?done"
}
},
resume: {
enabled: true
},
retry: {
enableAuto: true
},
thumbnails: {
placeholders: {
waitingPath: "/client/placeholders/waiting-generic.png",
notAvailablePath: "/client/placeholders/not_available-generic.png"
}
},
scaling: {
sizes: [{name: "small", maxSize: 300}, {name: "medium", maxSize: 600}]
},
callbacks: {
onError: errorHandler,
onUpload: function (id, filename) {
this.setParams({
"hey": "hi ɛ $ hmm \\ hi",
"ho": "foobar"
}, id);

},
thumbnails: {
placeholders: {
waitingPath: "/client/placeholders/waiting-generic.png",
notAvailablePath: "/client/placeholders/not_available-generic.png"
}
onStatusChange: function (id, oldS, newS) {
qq.log("id: " + id + " " + newS);
},
callbacks: {
onError: errorHandler,
onUpload: function (id, filename) {
this.setParams({
"hey": "hi ɛ $ hmm \\ hi",
"ho": "foobar"
}, id);

},
onStatusChange: function (id, oldS, newS) {
qq.log("id: " + id + " " + newS);
},
onComplete: function (id, name, response) {
qq.log(response);
}
onComplete: function (id, name, response) {
qq.log(response);
}
});
}
}
});

qq(document.getElementById("triggerUpload")).attach("click", function() {
manualUploader.uploadStoredFiles();
});


s3Uploader = new qq.s3.FineUploader({
element: document.getElementById("s3-example"),
Expand All @@ -79,10 +80,10 @@ qq(window).attach("load", function() {
accessKey: "AKIAJEQ4NDFBCZAMWGUQ"
},
signature: {
endpoint: "/upload/s3/signature"
endpoint: "/test/dev/handlers/s3/s3.php"
},
uploadSuccess: {
endpoint: "/upload/s3/success"
endpoint: "/test/dev/handlers/s3/s3.php?success"
},
iframeSupport: {
localBlankPagePath: "success.html"
Expand All @@ -102,7 +103,7 @@ qq(window).attach("load", function() {
},
deleteFile: {
enabled: true,
endpoint: "/upload/s3/files",
endpoint: "/test/dev/handlers/s3/s3.php",
forceConfirm: true,
params: {
foo: "bar"
Expand Down Expand Up @@ -141,75 +142,96 @@ qq(window).attach("load", function() {
}
});

if (qq.supportedFeatures.ajaxUploading) {
azureUploader = new qq.azure.FineUploader({
element: document.getElementById("azure-example"),
debug: true,
request: {
endpoint: "http://fineuploaderdev2.blob.core.windows.net/dev"
},
cors: {
expected: true
},
signature: {
endpoint: "http://192.168.56.101:8080/sas"
},
uploadSuccess: {
endpoint: "http://192.168.56.101:8080/success"
},
chunking: {
enabled: true,
concurrent: {
enabled: true
}
},
resume: {
enabled: true
},
retry: {
enableAuto: true,
showButton: true
},
deleteFile: {
enabled: true
},
display: {
fileSizeOnSubmit: true
},
paste: {
targetElement: document
},
thumbnails: {
placeholders: {
waitingPath: "/client/placeholders/waiting-generic.png",
notAvailablePath: "/client/placeholders/not_available-generic.png"
}
},
callbacks: {
onError: errorHandler,
onUpload: function (id, filename) {
this.setParams({
"hey": "hi ɛ $ hmm \\ hi",
"ho": "foobar"
}, id);

manualUploader = new qq.FineUploader({
element: document.getElementById("manual-example"),
autoUpload: false,
debug: true,
uploadButtonText: "Select Files",
display: {
fileSizeOnSubmit: true
},
},
onStatusChange: function (id, oldS, newS) {
qq.log("id: " + id + " " + newS);
},
onComplete: function (id, name, response) {
qq.log(response);
}
}
});
}

failingUploader = new qq.FineUploader({
element: document.getElementById("failure-example"),
request: {
endpoint: "/upload/receiver"
},
deleteFile: {
enabled: true,
endpoint: "/upload/receiver",
forceConfirm: true,
endpoint: "/test/dev/handlers/traditional/endpoint.php",
params: {
foo: "bar"
generateError: "true"
}
},
chunking: {
enabled: true,
concurrent: {
enabled: true
},
successEndpoint: "/upload/receiver?done"
},
resume: {
enabled: true
debug: true,
failedUploadTextDisplay: {
mode: "custom",
maxChars: 5
},
retry: {
enableAuto: true
},
thumbnails: {
placeholders: {
waitingPath: "/client/placeholders/waiting-generic.png",
notAvailablePath: "/client/placeholders/not_available-generic.png"
}
},
scaling: {
sizes: [{name: "small", maxSize: 300}, {name: "medium", maxSize: 600}]
enableAuto: true,
showButton: true
},
callbacks: {
onError: errorHandler,
onUpload: function (id, filename) {
this.setParams({
"hey": "hi ɛ $ hmm \\ hi",
"ho": "foobar"
}, id);

},
onStatusChange: function (id, oldS, newS) {
qq.log("id: " + id + " " + newS);
},
onComplete: function (id, name, response) {
qq.log(response);
}
onError: errorHandler
}
});

qq(document.getElementById("triggerUpload")).attach("click", function() {
manualUploader.uploadStoredFiles();
});

validatingUploader = new qq.FineUploader({
element: document.getElementById("validation-example"),
multiple: false,
request: {
endpoint: "/upload/receiver"
endpoint: "/test/dev/handlers/traditional/endpoint.php"
},
debug: true,
validation: {
Expand All @@ -227,26 +249,4 @@ qq(window).attach("load", function() {
onError: errorHandler
}
});

failingUploader = new qq.FineUploader({
element: document.getElementById("failure-example"),
request: {
endpoint: "/upload/receiver",
params: {
generateError: "true"
}
},
debug: true,
failedUploadTextDisplay: {
mode: "custom",
maxChars: 5
},
retry: {
enableAuto: true,
showButton: true
},
callbacks: {
onError: errorHandler
}
});
});
});
6 changes: 3 additions & 3 deletions test/dev/index.html
View file
Expand Up @@ -154,11 +154,11 @@
<meta charset="utf-8" />
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<!--<link href="https://netdna.bootstrapcdn.com/twitter-bootstrap/2.1.0/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>-->
<link href="../client/fineuploader-gallery.css" rel="stylesheet" type="text/css"/>
<!--<link href="../client/fineuploader-gallery.css" rel="stylesheet" type="text/css"/>-->
<link href="../../client/fineuploader-gallery.css" rel="stylesheet" type="text/css"/>
<!--<link href="../../client/fineuploader-gallery.css" rel="stylesheet" type="text/css"/>-->
<!--<link href="../client/fineuploader-legacy.css" rel="stylesheet" type="text/css"/>-->
<link href="styles.css" rel="stylesheet" type="text/css"/>
<script src="../_build/all.fine-uploader.js"></script>
<script src="../../_build/all.fine-uploader.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/json2/20121008/json2.min.js"></script>
<script src="devenv.js"></script>
</head>
Expand Down

0 comments on commit 7907d31

Please sign in to comment.