Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of yuisource.corp.yahoo.com:yui3

  • Loading branch information...
commit 3752397d9ac28df47ccab75e962494fc1d1b1026 2 parents f2ac40d + 2c75afa
@ericf ericf authored
View
12 src/uploader-deprecated/docs/component.json
@@ -3,14 +3,14 @@
"displayName": "Uploader (deprecated version)",
"description": "Provides file-upload functionality that goes beyond the native browser-based methods (multiple file upload, progress tracking, etc.)",
"author" : "allenrabinovich",
- "tags": ["utility", "beta", "uploader"],
+ "tags": ["utility", "beta", "uploader-deprecated"],
"use" : ["uploader-deprecated"],
"examples": [
{
"name" : "uploader-simple",
"displayName": "Simple Uploader with Progress Tracking",
"description": "How to upload a single file, while tracking progress and using a sprite-skinned button",
- "modules" : ["uploader"],
+ "modules" : ["uploader-deprecated"],
"tags" : ["uploader", "widget", "utility"],
"hideTableOfContents": true
@@ -19,8 +19,8 @@
"name" : "uploader-withvars",
"displayName": "Single File Upload with Additional Data",
"description": "How to upload a single file, along with GET and POST Vars Submission and receive data from the server",
- "modules" : ["uploader"],
- "tags" : ["uploader", "widget", "utility"],
+ "modules" : ["uploader-deprecated"],
+ "tags" : ["uploader-deprecated", "widget", "utility"],
"hideTableOfContents": true
},
@@ -28,8 +28,8 @@
"name" : "uploader-multiple",
"displayName": "Multiple Files Upload with Transparent Overlay Button",
"description": "How to upload multiple files with progress tracking and a transparent overlay upload button",
- "modules" : ["uploader"],
- "tags" : ["uploader", "widget", "utility"],
+ "modules" : ["uploader-deprecated"],
+ "tags" : ["uploader-deprecated", "widget", "utility"],
"hideTableOfContents": true
}
View
6 src/uploader/docs/partials/uploader-data-source.mustache
@@ -58,7 +58,8 @@ Y.one("#overallProgress").set("text", "Uploader type: " + Y.Uploader.TYPE);
multipleFiles: true,
swfURL: "{{yuiBuildUrl}}/uploader/assets/flashuploader.swf?t=" + Math.random(),
uploadURL: "http://www.yswfblog.com/upload/simpleupload.php",
- simLimit: 2
+ simLimit: 2,
+ withCredentials: false
});
var uploadDone = false;
@@ -155,8 +156,7 @@ Y.one("#overallProgress").set("text", "Uploader type: " + Y.Uploader.TYPE);
});
}
else {
- Y.one("#uploaderContainer").set("text", "We are sorry, but the uploader technology is not supported" +
- " on this platform.");
+ Y.one("#uploaderContainer").set("text", "We are sorry, but to use the uploader, you either need a browser that support HTML5 or have the Flash player installed on your computer.");
}
View
6 src/uploader/docs/partials/uploader-dd-source.mustache
@@ -54,7 +54,8 @@ Y.one("#overallProgress").set("text", "Uploader type: " + Y.Uploader.TYPE);
multipleFiles: true,
swfURL: "{{yuiBuildUrl}}/uploader/assets/flashuploader.swf?t=" + Math.random(),
uploadURL: "http://www.yswfblog.com/upload/simpleupload.php",
- simLimit: 2
+ simLimit: 2,
+ withCredentials: false
});
var uploadDone = false;
@@ -145,8 +146,7 @@ Y.one("#overallProgress").set("text", "Uploader type: " + Y.Uploader.TYPE);
});
}
else {
- Y.one("#uploaderContainer").set("text", "We are sorry, but the uploader technology is not supported" +
- " on this platform.");
+ Y.one("#uploaderContainer").set("text", "We are sorry, but to use the uploader, you either need a browser that support HTML5 or have the Flash player installed on your computer.");
}
View
6 src/uploader/docs/partials/uploader-multiple-source.mustache
@@ -48,7 +48,8 @@ Y.one("#overallProgress").set("text", "Uploader type: " + Y.Uploader.TYPE);
multipleFiles: true,
swfURL: "{{yuiBuildUrl}}/uploader/assets/flashuploader.swf?t=" + Math.random(),
uploadURL: "http://www.yswfblog.com/upload/simpleupload.php",
- simLimit: 2
+ simLimit: 2,
+ withCredentials: false
});
var uploadDone = false;
@@ -115,8 +116,7 @@ Y.one("#overallProgress").set("text", "Uploader type: " + Y.Uploader.TYPE);
});
}
else {
- Y.one("#uploaderContainer").set("text", "We are sorry, but the uploader technology is not supported" +
- " on this platform.");
+ Y.one("#uploaderContainer").set("text", "We are sorry, but to use the uploader, you either need a browser that support HTML5 or have the Flash player installed on your computer.");
}
View
3  src/uploader/docs/uploader-multiple.mustache
@@ -57,7 +57,8 @@ your tests to a few small files to avoid overloading the system.</p>
multipleFiles: true,
swfURL: "{{yuiBuildUrl}}/uploader/assets/flashuploader.swf?t=" + Math.random(),
uploadURL: "http://www.yswfblog.com/upload/simpleupload.php",
- simLimit: 2
+ simLimit: 2,
+ withCredentials: false
});
var uploadDone = false;
Please sign in to comment.
Something went wrong with that request. Please try again.