<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[26205] trunk/src/wp-includes/js/plupload/handlers.js: Fix JSHint errors in plupload handlers.js.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26205">26205</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-11-15 05:55:24 +0000 (Fri, 15 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix JSHint errors in plupload handlers.js.
props mdbitz.
fixes <a href="http://core.trac.wordpress.org/ticket/26041">#26041</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjspluploadhandlersjs">trunk/src/wp-includes/js/plupload/handlers.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjspluploadhandlersjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/plupload/handlers.js (26204 => 26205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/plupload/handlers.js 2013-11-15 05:34:14 UTC (rev 26204)
+++ trunk/src/wp-includes/js/plupload/handlers.js 2013-11-15 05:55:24 UTC (rev 26205)
</span><span class="lines">@@ -1,9 +1,7 @@
</span><ins>+/* global plupload, pluploadL10n, ajaxurl, post_id, wpUploaderInit, deleteUserSetting, setUserSetting, getUserSetting */
+/* global resize_width, resize_height, shortform */
</ins><span class="cx"> var topWin = window.dialogArguments || opener || parent || top, uploader, uploader_init;
</span><span class="cx">
</span><del>-function fileDialogStart() {
- jQuery("#media-upload-error").empty();
-}
-
</del><span class="cx"> // progress and success handlers for media multi uploads
</span><span class="cx"> function fileQueued(fileObj) {
</span><span class="cx"> // Get rid of unused form
</span><span class="lines">@@ -49,9 +47,8 @@
</span><span class="cx">
</span><span class="cx"> if ( max > hundredmb && file.size > hundredmb ) {
</span><span class="cx"> setTimeout(function(){
</span><del>- var done;
-
- if ( file.status < 3 && file.loaded == 0 ) { // not uploading
</del><ins>+
+ if ( file.status < 3 && file.loaded === 0 ) { // not uploading
</ins><span class="cx"> wpFileError(file, pluploadL10n.big_upload_failed.replace('%1$s', '<a class="uploader-html" href="#">').replace('%2$s', '</a>'));
</span><span class="cx"> up.stop(); // stops the whole queue
</span><span class="cx"> up.removeFile(file);
</span><span class="lines">@@ -106,7 +103,7 @@
</span><span class="cx"> function setResize(arg) {
</span><span class="cx"> if ( arg ) {
</span><span class="cx"> if ( uploader.features.jpgresize )
</span><del>- uploader.settings['resize'] = { width: resize_width, height: resize_height, quality: 100 };
</del><ins>+ uploader.settings.resize = { width: resize_width, height: resize_height, quality: 100 };
</ins><span class="cx"> else
</span><span class="cx"> uploader.settings.multipart_params.image_resize = true;
</span><span class="cx"> } else {
</span><span class="lines">@@ -129,7 +126,7 @@
</span><span class="cx"> item.append(serverData);
</span><span class="cx"> prepareMediaItemInit(fileObj);
</span><span class="cx"> } else { // New style: server data is just the attachment ID, fetch the thumbnail and form html from the server
</span><del>- item.load('async-upload.php', {attachment_id:serverData, fetch:f}, function(){prepareMediaItemInit(fileObj);updateMediaForm()});
</del><ins>+ item.load('async-upload.php', {attachment_id:serverData, fetch:f}, function(){prepareMediaItemInit(fileObj);updateMediaForm();});
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -171,9 +168,10 @@
</span><span class="cx"> action: 'untrash-post',
</span><span class="cx"> _ajax_nonce: this.href.replace(/^.*wpnonce=/,'')
</span><span class="cx"> },
</span><del>- success: function(data, textStatus){
- var item = jQuery('#media-item-' + fileObj.id);
-
</del><ins>+ success: function( ){
+ var type,
+ item = jQuery('#media-item-' + fileObj.id);
+
</ins><span class="cx"> if ( type = jQuery('#type-of-' + fileObj.id).val() )
</span><span class="cx"> jQuery('#' + type + '-counter').text(jQuery('#' + type + '-counter').text()-0+1);
</span><span class="cx">
</span><span class="lines">@@ -210,21 +208,23 @@
</span><span class="cx"> if ( last_err == id ) // prevent firing an error for the same file twice
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- item.html('<div class="error-div">'
- + '<a class="dismiss" href="#">' + pluploadL10n.dismiss + '</a>'
- + '<strong>' + pluploadL10n.error_uploading.replace('%s', jQuery.trim(filename)) + '</strong> '
- + message
- + '</div>').data('last-err', id);
</del><ins>+ item.html('<div class="error-div">' +
+ '<a class="dismiss" href="#">' + pluploadL10n.dismiss + '</a>' +
+ '<strong>' + pluploadL10n.error_uploading.replace('%s', jQuery.trim(filename)) + '</strong> ' +
+ message +
+ '</div>').data('last-err', id);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function deleteSuccess(data, textStatus) {
</del><ins>+function deleteSuccess(data) {
+ var type, id, item;
</ins><span class="cx"> if ( data == '-1' )
</span><span class="cx"> return itemAjaxError(this.id, 'You do not have permission. Has your session expired?');
</span><span class="cx">
</span><span class="cx"> if ( data == '0' )
</span><span class="cx"> return itemAjaxError(this.id, 'Could not be deleted. Has it been deleted already?');
</span><span class="cx">
</span><del>- var id = this.id, item = jQuery('#media-item-' + id);
</del><ins>+ id = this.id;
+ item = jQuery('#media-item-' + id);
</ins><span class="cx">
</span><span class="cx"> // Decrement the counters.
</span><span class="cx"> if ( type = jQuery('#type-of-' + id).val() )
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function deleteError(X, textStatus, errorThrown) {
</del><ins>+function deleteError() {
</ins><span class="cx"> // TODO
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -273,16 +273,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function dndHelper(s) {
- var d = document.getElementById('dnd-helper');
-
- if ( s ) {
- d.style.display = 'block';
- } else {
- d.style.display = 'none';
- }
-}
-
</del><span class="cx"> function uploadError(fileObj, errorCode, message, uploader) {
</span><span class="cx"> var hundredmb = 100 * 1024 * 1024, max;
</span><span class="cx">
</span><span class="lines">@@ -459,9 +449,7 @@
</span><span class="cx"> up.start();
</span><span class="cx"> });
</span><span class="cx">
</span><del>- uploader.bind('BeforeUpload', function(up, file) {
- // something
- });
</del><ins>+ // uploader.bind('BeforeUpload', function(up, file) {});
</ins><span class="cx">
</span><span class="cx"> uploader.bind('UploadFile', function(up, file) {
</span><span class="cx"> fileUploading(up, file);
</span><span class="lines">@@ -480,12 +468,13 @@
</span><span class="cx"> uploadSuccess(file, response.response);
</span><span class="cx"> });
</span><span class="cx">
</span><del>- uploader.bind('UploadComplete', function(up, files) {
</del><ins>+ uploader.bind('UploadComplete', function() {
</ins><span class="cx"> uploadComplete();
</span><span class="cx"> });
</span><del>- }
</del><ins>+ };
</ins><span class="cx">
</span><del>- if ( typeof(wpUploaderInit) == 'object' )
</del><ins>+ if ( typeof(wpUploaderInit) == 'object' ) {
</ins><span class="cx"> uploader_init();
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> });
</span></span></pre>
</div>
</div>
</body>
</html>