Skip to content

Commit

Permalink
Fixed paths in examples and pretified them; build script will automat…
Browse files Browse the repository at this point in the history 
…ically substitute script paths from dev to release on built.
  • Loading branch information
@jayarjo
jayarjo committed Apr 12, 2011
1 parent d98bf6f commit 74b02e8
Show file tree
Hide file tree
Showing 10 changed files with 337 additions and 445 deletions.
49 changes: 33 additions & 16 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,17 @@

<target name="clean">
<delete quiet="true">
<fileset dir="js" includes="**/*"/>
<fileset dir="js" includes="**/*">
<exclude name="plupload.flash.swf"/>
<exclude name="plupload.silverlight.xap"/>
</fileset>
</delete>
</target>

<target name="build-jquery-widgets">
<!-- Copy all jquery.plupload.queue resources -->
<copy todir="js/jquery.plupload.queue">
<fileset dir="src/javascript/jquery.ui.plupload">
<fileset dir="src/javascript/jquery.plupload.queue">
<include name="**"/>
</fileset>
</copy>
Expand Down Expand Up @@ -122,7 +125,7 @@
</copy>

<copy todir="${tmp_dir}/plupload/js">
<fileset dir="bin/">
<fileset dir="js/">
<include name="plupload.flash.swf"/>
<include name="plupload.silverlight.xap"/>
</fileset>
Expand All @@ -143,15 +146,35 @@
<include name="*/**" />
</fileset>
</replaceregexp>


<!-- Compress dev package -->
<delete file="${tmp_dir}/plupload_${file_version}_dev.zip" quiet="true" />
<zip destfile="${tmp_dir}/plupload_${file_version}_dev.zip">
<zipfileset dir="${tmp_dir}/plupload" prefix="plupload">
<include name="*/**" />
</zipfileset>
</zip>

<!-- Load proper versions of scripts in examples -->
<replaceregexp byline="true">
<regexp pattern="src\/javascript\/" />
<substitution expression="js\/" />

<fileset dir="${tmp_dir}/plupload/examples">
<include name="*/**" />
</fileset>
</replaceregexp>


<!-- Compress core package -->
<delete file="${tmp_dir}/plupload_${file_version}_core.zip" quiet="true" />
<zip destfile="${tmp_dir}/plupload_${file_version}_core.zip">
<delete file="${tmp_dir}/plupload_${file_version}.zip" quiet="true" />
<zip destfile="${tmp_dir}/plupload_${file_version}.zip">
<zipfileset dir="${tmp_dir}/plupload" prefix="plupload">
<include name="*/**" />
<exclude name="examples/jquery/**" />
<!-- <exclude name="examples/jquery/**" /> -->
<exclude name="src/**" />
<exclude name="js/jquery*/**" />
<!-- <exclude name="js/jquery*/**" /> -->
<exclude name="tools/**" />
<exclude name="build.xml" />
<exclude name="build.bat" />
Expand All @@ -160,7 +183,7 @@
</zip>

<!-- Compress jQuery package -->
<delete file="${tmp_dir}/plupload_${file_version}_jquery.zip" quiet="true" />
<!--<delete file="${tmp_dir}/plupload_${file_version}_jquery.zip" quiet="true" />
<zip destfile="${tmp_dir}/plupload_${file_version}_jquery.zip">
<zipfileset dir="${tmp_dir}/plupload" prefix="plupload">
<include name="*/**" />
Expand All @@ -170,14 +193,8 @@
<exclude name="build.bat" />
<exclude name="tests/**" />
</zipfileset>
</zip>
</zip>-->

<!-- Compress dev package -->
<delete file="${tmp_dir}/plupload_${file_version}_dev.zip" quiet="true" />
<zip destfile="${tmp_dir}/plupload_${file_version}_dev.zip">
<zipfileset dir="${tmp_dir}/plupload" prefix="plupload">
<include name="*/**" />
</zipfileset>
</zip>

</target>
</project>
4 changes: 4 additions & 0 deletions changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Version 1.4.3.1 (2011-04-12)
Fixed build script, mistakenly populating jquery.plupload.queue directory from jquery.ui.plupload sources.


Version 1.4.3 (2011-04-11)
Added Latvian language pack and updated French.
Fixed bug in Flash runtime when JPEG header was not investigated deep enough to reach SOFn marker in large images.
Expand Down
118 changes: 61 additions & 57 deletions examples/custom.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,72 +2,30 @@
<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" href="css/plupload.queue.css" type="text/css" media="screen" />

<title>Plupload - Queue widget example</title>

<style type="text/css">
body {background: #9A7C5F;}
body {
font-family:Verdana, Geneva, sans-serif;
font-size:13px;
color:#333;
background:url(bg.jpg);
}
</style>
<script type="text/javascript" src="http://www.google.com/jsapi"></script>
<script type="text/javascript">
google.load("jquery", "1.3");
</script>

<script type="text/javascript" src="http://bp.yahooapis.com/2.4.21/browserplus-min.js"></script>
<!-- Load source versions of the plupload script files -->

<script type="text/javascript" src="../src/javascript/plupload.js"></script>
<script type="text/javascript" src="../src/javascript/plupload.gears.js"></script>
<script type="text/javascript" src="../src/javascript/plupload.silverlight.js"></script>
<script type="text/javascript" src="../src/javascript/plupload.flash.js"></script>
<script type="text/javascript" src="../src/javascript/plupload.browserplus.js"></script>
<script type="text/javascript" src="../src/javascript/plupload.html4.js"></script>
<script type="text/javascript" src="../src/javascript/plupload.html5.js"></script>
<script type="text/javascript" src="../src/javascript/jquery.plupload.queue.js"></script>
<script>
// Custom example logic
$(function() {
var uploader = new plupload.Uploader({
runtimes : 'gears,html5,flash,silverlight,browserplus',
browse_button : 'pickfiles',
max_file_size : '10mb',
url : 'upload.php',
resize : {width : 320, height : 240, quality : 90},
flash_swf_url : '../js/plupload.flash.swf',
silverlight_xap_url : '../js/plupload.silverlight.xap',
filters : [
{title : "Image files", extensions : "jpg,gif,png"},
{title : "Zip files", extensions : "zip"}
]
});

uploader.bind('Init', function(up, params) {
$('#filelist').html("<div>Current runtime: " + params.runtime + "</div>");
});

uploader.bind('FilesAdded', function(up, files) {
$.each(files, function(i, file) {
$('#filelist').append(
'<div id="' + file.id + '">' +
file.name + ' (' + plupload.formatSize(file.size) + ') <b></b>' +
'</div>');
});
});

uploader.bind('UploadFile', function(up, file) {
$('<input type="hidden" name="file-' + file.id + '" value="' + file.name + '" />')
.appendTo('#submit-form');
});

uploader.bind('UploadProgress', function(up, file) {
$('#' + file.id + " b").html(file.percent + "%");
});

$('#uploadfiles').click(function(e) {
uploader.start();
e.preventDefault();
});

uploader.init();
});
</script>

<!-- <script type="text/javascript" src="http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js"></script> -->

</head>
<body>

Expand All @@ -79,12 +37,58 @@ <h1>Custom example</h1>
<div>
<div id="filelist">No runtime found.</div>
<br />
<a id="pickfiles" href="#">[Select files]</a>
<a id="uploadfiles" href="#">[Upload files]</a>
<a id="pickfiles" href="javascript:;">[Select files]</a>
<a id="uploadfiles" href="javascript:;">[Upload files]</a>
</div>

<input type="submit" />
</form>

<script type="text/javascript">
// Custom example logic
function $(id) {
return document.getElementById(id);
}


var uploader = new plupload.Uploader({
runtimes : 'gears,html5,flash,silverlight,browserplus',
browse_button : 'pickfiles',
max_file_size : '10mb',
url : 'upload.php',
resize : {width : 320, height : 240, quality : 90},
flash_swf_url : '../js/plupload.flash.swf',
silverlight_xap_url : '../js/plupload.silverlight.xap',
filters : [
{title : "Image files", extensions : "jpg,gif,png"},
{title : "Zip files", extensions : "zip"}
]
});

uploader.bind('Init', function(up, params) {
$('filelist').innerHTML = "<div>Current runtime: " + params.runtime + "</div>";
});

uploader.bind('FilesAdded', function(up, files) {
for (var i in files) {
$('filelist').innerHTML += '<div id="' + files[i].id + '">' + files[i].name + ' (' + plupload.formatSize(files[i].size) + ') <b></b></div>';
}
});

uploader.bind('UploadFile', function(up, file) {
$('submit-form').innerHTML += '<input type="hidden" name="file-' + file.id + '" value="' + file.name + '" />';
});

uploader.bind('UploadProgress', function(up, file) {
$(file.id).getElementsByTagName('b')[0].innerHTML = '<span>' + file.percent + "%</span>";
});

$('uploadfiles').onclick = function() {
uploader.start();
return false;
};

uploader.init();
</script>
</body>
</html>
7 changes: 6 additions & 1 deletion examples/dump.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@
<link rel="stylesheet" href="css/plupload.css" type="text/css" media="screen" />
<title>Plupload - Form dump</title>
<style type="text/css">
body {background: #9A7C5F;}
body {
font-family:Verdana, Geneva, sans-serif;
font-size:13px;
color:#333;
background:url(bg.jpg);
}
</style>
</head>
<body>
Expand Down
58 changes: 34 additions & 24 deletions examples/jquery/events.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,42 @@
<link rel="stylesheet" href="../../js/jquery.plupload.queue/css/jquery.plupload.queue.css" type="text/css" media="screen" />
<title>Plupload - Events example</title>
<style type="text/css">
body {background: #9A7C5F;}
body {
font-family:Verdana, Geneva, sans-serif;
font-size:13px;
color:#333;
background:url(../bg.jpg);
}
</style>
<script type="text/javascript" src="http://www.google.com/jsapi"></script>
<script type="text/javascript">
google.load("jquery", "1.3");
</script>

<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script>
<script type="text/javascript" src="http://bp.yahooapis.com/2.4.21/browserplus-min.js"></script>
<script type="text/javascript" src="../../js/plupload.full.js"></script>

<script type="text/javascript" src="../../src/javascript/plupload.js"></script>
<script type="text/javascript" src="../../src/javascript/plupload.gears.js"></script>
<script type="text/javascript" src="../../src/javascript/plupload.silverlight.js"></script>
<script type="text/javascript" src="../../src/javascript/plupload.flash.js"></script>
<script type="text/javascript" src="../../src/javascript/plupload.browserplus.js"></script>
<script type="text/javascript" src="../../src/javascript/plupload.html4.js"></script>
<script type="text/javascript" src="../../src/javascript/plupload.html5.js"></script>
<script type="text/javascript" src="../../js/jquery.plupload.queue/jquery.plupload.queue.js"></script>
<script>

</head>
<body>

<form method="post" action="dump.php">
<h1>Events example</h1>

<p>Shows how to bind and use all available events.</p>

<h3>Log messages</h3>
<textarea id="log" style="width: 100%; height: 150px; font-size: 11px" spellcheck="false" wrap="off"></textarea>

<h3>Queue widget</h3>
<div id="uploader" style="width: 450px; height: 330px;">You browser doesn't support upload.</div>
<a id="clear" href="#">Clear queue</a>
</form>
<script type="text/javascript">
$(function() {
function log() {
var str = "";
Expand Down Expand Up @@ -63,7 +89,7 @@
$("#uploader").pluploadQueue({
// General settings
runtimes: 'html5,gears,browserplus,silverlight,flash,html4',
url: 'upload.php',
url: '../upload.php',
max_file_size: '10mb',
chunk_size: '1mb',
unique_names: true,
Expand Down Expand Up @@ -166,21 +192,5 @@
});
});
</script>
</head>
<body>

<form method="post" action="dump.php">
<h1>Events example</h1>

<p>Shows how to bind and use all available events.</p>

<h3>Log messages</h3>
<textarea id="log" style="width: 100%; height: 150px; font-size: 11px" spellcheck="false" wrap="off"></textarea>

<h3>Queue widget</h3>
<div id="uploader" style="width: 450px; height: 330px;">You browser doesn't support upload.</div>
<a id="clear" href="#">Clear queue</a>
</form>

</body>
</html>
Loading

0 comments on commit 74b02e8

Please sign in to comment.