Fix JSHint errors in gallery.js.
props dougwollison. fixes #25999. git-svn-id: https://develop.svn.wordpress.org/trunk@26269 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
cb5682ac2f
commit
659b2758ff
@ -1,5 +1,7 @@
|
|||||||
|
/* global unescape, getUserSetting, setUserSetting */
|
||||||
|
|
||||||
jQuery(document).ready(function($) {
|
jQuery(document).ready(function($) {
|
||||||
var gallerySortable, gallerySortableInit, w, desc = false;
|
var gallerySortable, gallerySortableInit, sortIt, clearAll, w, desc = false;
|
||||||
|
|
||||||
gallerySortableInit = function() {
|
gallerySortableInit = function() {
|
||||||
gallerySortable = $('#media-items').sortable( {
|
gallerySortable = $('#media-items').sortable( {
|
||||||
@ -8,7 +10,7 @@ jQuery(document).ready(function($) {
|
|||||||
axis: 'y',
|
axis: 'y',
|
||||||
distance: 2,
|
distance: 2,
|
||||||
handle: 'div.filename',
|
handle: 'div.filename',
|
||||||
stop: function(e, ui) {
|
stop: function() {
|
||||||
// When an update has occurred, adjust the order for each item
|
// When an update has occurred, adjust the order for each item
|
||||||
var all = $('#media-items').sortable('toArray'), len = all.length;
|
var all = $('#media-items').sortable('toArray'), len = all.length;
|
||||||
$.each(all, function(i, id) {
|
$.each(all, function(i, id) {
|
||||||
@ -17,7 +19,7 @@ jQuery(document).ready(function($) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
}
|
};
|
||||||
|
|
||||||
sortIt = function() {
|
sortIt = function() {
|
||||||
var all = $('.menu_order_input'), len = all.length;
|
var all = $('.menu_order_input'), len = all.length;
|
||||||
@ -25,26 +27,39 @@ jQuery(document).ready(function($) {
|
|||||||
var order = desc ? (len - i) : (1 + i);
|
var order = desc ? (len - i) : (1 + i);
|
||||||
$(this).val(order);
|
$(this).val(order);
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
clearAll = function(c) {
|
clearAll = function(c) {
|
||||||
c = c || 0;
|
c = c || 0;
|
||||||
$('.menu_order_input').each(function(){
|
$('.menu_order_input').each( function() {
|
||||||
if ( this.value == '0' || c ) this.value = '';
|
if ( this.value === '0' || c ) {
|
||||||
|
this.value = '';
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
$('#asc').click(function(){desc = false; sortIt(); return false;});
|
$('#asc').click( function() {
|
||||||
$('#desc').click(function(){desc = true; sortIt(); return false;});
|
desc = false;
|
||||||
$('#clear').click(function(){clearAll(1); return false;});
|
sortIt();
|
||||||
$('#showall').click(function(){
|
return false;
|
||||||
|
});
|
||||||
|
$('#desc').click( function() {
|
||||||
|
desc = true;
|
||||||
|
sortIt();
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
$('#clear').click( function() {
|
||||||
|
clearAll(1);
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
$('#showall').click( function() {
|
||||||
$('#sort-buttons span a').toggle();
|
$('#sort-buttons span a').toggle();
|
||||||
$('a.describe-toggle-on').hide();
|
$('a.describe-toggle-on').hide();
|
||||||
$('a.describe-toggle-off, table.slidetoggle').show();
|
$('a.describe-toggle-off, table.slidetoggle').show();
|
||||||
$('img.pinkynail').toggle(false);
|
$('img.pinkynail').toggle(false);
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
$('#hideall').click(function(){
|
$('#hideall').click( function() {
|
||||||
$('#sort-buttons span a').toggle();
|
$('#sort-buttons span a').toggle();
|
||||||
$('a.describe-toggle-on').show();
|
$('a.describe-toggle-on').show();
|
||||||
$('a.describe-toggle-off, table.slidetoggle').hide();
|
$('a.describe-toggle-off, table.slidetoggle').hide();
|
||||||
@ -60,7 +75,7 @@ jQuery(document).ready(function($) {
|
|||||||
w = wpgallery.getWin();
|
w = wpgallery.getWin();
|
||||||
|
|
||||||
$('#save-all, #gallery-settings').show();
|
$('#save-all, #gallery-settings').show();
|
||||||
if ( typeof w.tinyMCE != 'undefined' && w.tinyMCE.activeEditor && ! w.tinyMCE.activeEditor.isHidden() ) {
|
if ( typeof w.tinyMCE !== 'undefined' && w.tinyMCE.activeEditor && ! w.tinyMCE.activeEditor.isHidden() ) {
|
||||||
wpgallery.mcemode = true;
|
wpgallery.mcemode = true;
|
||||||
wpgallery.init();
|
wpgallery.init();
|
||||||
} else {
|
} else {
|
||||||
@ -88,7 +103,9 @@ wpgallery = {
|
|||||||
init: function() {
|
init: function() {
|
||||||
var t = this, li, q, i, it, w = t.getWin();
|
var t = this, li, q, i, it, w = t.getWin();
|
||||||
|
|
||||||
if ( ! t.mcemode ) return;
|
if ( ! t.mcemode ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
li = ('' + document.location.search).replace(/^\?/, '').split('&');
|
li = ('' + document.location.search).replace(/^\?/, '').split('&');
|
||||||
q = {};
|
q = {};
|
||||||
@ -97,8 +114,9 @@ wpgallery = {
|
|||||||
q[unescape(it[0])] = unescape(it[1]);
|
q[unescape(it[0])] = unescape(it[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (q.mce_rdomain)
|
if ( q.mce_rdomain ) {
|
||||||
document.domain = q.mce_rdomain;
|
document.domain = q.mce_rdomain;
|
||||||
|
}
|
||||||
|
|
||||||
// Find window & API
|
// Find window & API
|
||||||
tinymce = w.tinymce;
|
tinymce = w.tinymce;
|
||||||
@ -114,18 +132,28 @@ wpgallery = {
|
|||||||
|
|
||||||
setup : function() {
|
setup : function() {
|
||||||
var t = this, a, ed = t.editor, g, columns, link, order, orderby;
|
var t = this, a, ed = t.editor, g, columns, link, order, orderby;
|
||||||
if ( ! t.mcemode ) return;
|
if ( ! t.mcemode ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
t.el = ed.selection.getNode();
|
t.el = ed.selection.getNode();
|
||||||
|
|
||||||
if ( t.el.nodeName != 'IMG' || ! ed.dom.hasClass(t.el, 'wpGallery') ) {
|
if ( t.el.nodeName !== 'IMG' || ! ed.dom.hasClass(t.el, 'wpGallery') ) {
|
||||||
if ( (g = ed.dom.select('img.wpGallery')) && g[0] ) {
|
if ( ( g = ed.dom.select('img.wpGallery') ) && g[0] ) {
|
||||||
t.el = g[0];
|
t.el = g[0];
|
||||||
} else {
|
} else {
|
||||||
if ( getUserSetting('galfile') == '1' ) t.I('linkto-file').checked = "checked";
|
if ( getUserSetting('galfile') === '1' ) {
|
||||||
if ( getUserSetting('galdesc') == '1' ) t.I('order-desc').checked = "checked";
|
t.I('linkto-file').checked = 'checked';
|
||||||
if ( getUserSetting('galcols') ) t.I('columns').value = getUserSetting('galcols');
|
}
|
||||||
if ( getUserSetting('galord') ) t.I('orderby').value = getUserSetting('galord');
|
if ( getUserSetting('galdesc') === '1' ) {
|
||||||
|
t.I('order-desc').checked = 'checked';
|
||||||
|
}
|
||||||
|
if ( getUserSetting('galcols') ) {
|
||||||
|
t.I('columns').value = getUserSetting('galcols');
|
||||||
|
}
|
||||||
|
if ( getUserSetting('galord') ) {
|
||||||
|
t.I('orderby').value = getUserSetting('galord');
|
||||||
|
}
|
||||||
jQuery('#insert-gallery').show();
|
jQuery('#insert-gallery').show();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -143,10 +171,18 @@ wpgallery = {
|
|||||||
order = a.match(/order=['"]([^'"]+)['"]/i);
|
order = a.match(/order=['"]([^'"]+)['"]/i);
|
||||||
orderby = a.match(/orderby=['"]([^'"]+)['"]/i);
|
orderby = a.match(/orderby=['"]([^'"]+)['"]/i);
|
||||||
|
|
||||||
if ( link && link[1] ) t.I('linkto-file').checked = "checked";
|
if ( link && link[1] ) {
|
||||||
if ( order && order[1] ) t.I('order-desc').checked = "checked";
|
t.I('linkto-file').checked = 'checked';
|
||||||
if ( columns && columns[1] ) t.I('columns').value = ''+columns[1];
|
}
|
||||||
if ( orderby && orderby[1] ) t.I('orderby').value = orderby[1];
|
if ( order && order[1] ) {
|
||||||
|
t.I('order-desc').checked = 'checked';
|
||||||
|
}
|
||||||
|
if ( columns && columns[1] ) {
|
||||||
|
t.I('columns').value = '' + columns[1];
|
||||||
|
}
|
||||||
|
if ( orderby && orderby[1] ) {
|
||||||
|
t.I('orderby').value = orderby[1];
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
jQuery('#insert-gallery').show();
|
jQuery('#insert-gallery').show();
|
||||||
}
|
}
|
||||||
@ -156,14 +192,16 @@ wpgallery = {
|
|||||||
var t = this, ed = t.editor, all = '', s;
|
var t = this, ed = t.editor, all = '', s;
|
||||||
|
|
||||||
if ( ! t.mcemode || ! t.is_update ) {
|
if ( ! t.mcemode || ! t.is_update ) {
|
||||||
s = '[gallery'+t.getSettings()+']';
|
s = '[gallery' + t.getSettings() + ']';
|
||||||
t.getWin().send_to_editor(s);
|
t.getWin().send_to_editor(s);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (t.el.nodeName != 'IMG') return;
|
if ( t.el.nodeName !== 'IMG' ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
all = ed.dom.decode(ed.dom.getAttrib(t.el, 'title'));
|
all = ed.dom.decode( ed.dom.getAttrib( t.el, 'title' ) );
|
||||||
all = all.replace(/\s*(order|link|columns|orderby)=['"]([^'"]+)['"]/gi, '');
|
all = all.replace(/\s*(order|link|columns|orderby)=['"]([^'"]+)['"]/gi, '');
|
||||||
all += t.getSettings();
|
all += t.getSettings();
|
||||||
|
|
||||||
@ -184,13 +222,13 @@ wpgallery = {
|
|||||||
setUserSetting('galdesc', '1');
|
setUserSetting('galdesc', '1');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( I('columns').value != 3 ) {
|
if ( I('columns').value !== 3 ) {
|
||||||
s += ' columns="'+I('columns').value+'"';
|
s += ' columns="' + I('columns').value + '"';
|
||||||
setUserSetting('galcols', I('columns').value);
|
setUserSetting('galcols', I('columns').value);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( I('orderby').value != 'menu_order' ) {
|
if ( I('orderby').value !== 'menu_order' ) {
|
||||||
s += ' orderby="'+I('orderby').value+'"';
|
s += ' orderby="' + I('orderby').value + '"';
|
||||||
setUserSetting('galord', I('orderby').value);
|
setUserSetting('galord', I('orderby').value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user