X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..fa11948979fd6a4ea5705dc613b239699a459db3:/wp-admin/js/gallery.js

diff --git a/wp-admin/js/gallery.js b/wp-admin/js/gallery.js
index c0be92f8..d7b4bb19 100644
--- a/wp-admin/js/gallery.js
+++ b/wp-admin/js/gallery.js
@@ -1,33 +1,63 @@
-jQuery(function($) {
-	var gallerySortable;
-	var gallerySortableInit = function() {
+jQuery(document).ready(function($) {
+	var gallerySortable, gallerySortableInit, w, desc = false;
+
+	gallerySortableInit = function() {
 		gallerySortable = $('#media-items').sortable( {
-			items: '.media-item',
+			items: 'div.media-item',
 			placeholder: 'sorthelper',
 			axis: 'y',
 			distance: 2,
-			update: galleryReorder
+			handle: 'div.filename',
+			stop: function(e, ui) {
+				// When an update has occurred, adjust the order for each item
+				var all = $('#media-items').sortable('toArray'), len = all.length;
+				$.each(all, function(i, id) {
+					var order = desc ? (len - i) : (1 + i);
+					$('#' + id + ' .menu_order input').val(order);
+				});
+			}
 		} );
 	}
 
-	// When an update has occurred, adjust the order for each item
-	var galleryReorder = function(e, sort) {
-		jQuery.each(sort['element'].sortable('toArray'), function(i, id) {
-			jQuery('#' + id + ' .menu_order input')[0].value = (1+i);
+	sortIt = function() {
+		var all = $('.menu_order_input'), len = all.length;
+		all.each(function(i){
+			var order = desc ? (len - i) : (1 + i);
+			$(this).val(order);
 		});
 	}
 
-	// initialize sortable
-	gallerySortableInit();
-});
+	clearAll = function(c) {
+		c = c || 0;
+		$('.menu_order_input').each(function(){
+			if ( this.value == '0' || c ) this.value = '';
+		});
+	}
 
-jQuery(document).ready(function($){
-	$('.menu_order_input').each(function(){
-		if ( this.value == '0' ) this.value = '';
+	$('#asc').click(function(){desc = false; sortIt(); 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();
+		$('a.describe-toggle-on').hide();
+		$('a.describe-toggle-off, table.slidetoggle').show();
+		$('img.pinkynail').toggle(false);
+		return false;
 	});
+	$('#hideall').click(function(){
+		$('#sort-buttons span a').toggle();
+		$('a.describe-toggle-on').show();
+		$('a.describe-toggle-off, table.slidetoggle').hide();
+		$('img.pinkynail').toggle(true);
+		return false;
+	});
+
+	// initialize sortable
+	gallerySortableInit();
+	clearAll();
 
 	if ( $('#media-items>*').length > 1 ) {
-		var w = wpgallery.getWin();
+		w = wpgallery.getWin();
 
 		$('#save-all, #gallery-settings').show();
 		if ( typeof w.tinyMCE != 'undefined' && w.tinyMCE.activeEditor && ! w.tinyMCE.activeEditor.isHidden() ) {
@@ -42,9 +72,9 @@ jQuery(document).ready(function($){
 jQuery(window).unload( function () { tinymce = tinyMCE = wpgallery = null; } ); // Cleanup
 
 /* gallery settings */
-var tinymce = null, tinyMCE;
+var tinymce = null, tinyMCE, wpgallery;
 
-var wpgallery = {
+wpgallery = {
 	mcemode : false,
 	editor : {},
 	dom : {},
@@ -82,18 +112,10 @@ var wpgallery = {
 		return window.dialogArguments || opener || parent || top;
 	},
 
-	restoreSelection : function() {
-		var t = this;
-
-		if (tinymce.isIE)
-			t.editor.selection.moveToBookmark(t.editor.windowManager.bookmark);
-	},
-
 	setup : function() {
-		var t = this, a, f = document.forms[0], ed = t.editor, el, g;
+		var t = this, a, ed = t.editor, g, columns, link, order, orderby;
 		if ( ! t.mcemode ) return;
 
-		t.restoreSelection();
 		t.el = ed.selection.getNode();
 
 		if ( t.el.nodeName != 'IMG' || ! ed.dom.hasClass(t.el, 'wpGallery') ) {
@@ -116,8 +138,10 @@ var wpgallery = {
 			jQuery('#update-gallery').show();
 			t.is_update = true;
 
-			var columns = a.match(/columns=['"]([0-9]+)['"]/), link = a.match(/link=['"]([^'"]+)['"]/i);
-			var order = a.match(/order=['"]([^'"]+)['"]/i), orderby = a.match(/orderby=['"]([^'"]+)['"]/i), all = '';
+			columns = a.match(/columns=['"]([0-9]+)['"]/);
+			link = a.match(/link=['"]([^'"]+)['"]/i);
+			order = a.match(/order=['"]([^'"]+)['"]/i);
+			orderby = a.match(/orderby=['"]([^'"]+)['"]/i);
 
 			if ( link && link[1] ) t.I('linkto-file').checked = "checked";
 			if ( order && order[1] ) t.I('order-desc').checked = "checked";
@@ -129,10 +153,10 @@ var wpgallery = {
 	},
 
 	update : function() {
-		var t = this, ed = t.editor, el, all = '';
+		var t = this, ed = t.editor, all = '', s;
 
 		if ( ! t.mcemode || ! t.is_update ) {
-			var s = '[gallery'+t.getSettings()+']';
+			s = '[gallery'+t.getSettings()+']';
 			t.getWin().send_to_editor(s);
 			return;
 		}