").html(g).find("li"),l;if(!h.length){b(".categorychecklist",c).html("
"+navMenuL10n.noResultsFound+"
");b("img.waiting",c).hide();return}h.each(function(){l=b(this);e=j.exec(l.html());if(e&&e[1]){i=e[1];while(d.elements["menu-item["+i+"][menu-item-type]"]||f[i]){i--}f[i]=true;if(i!=e[1]){l.html(l.html().replace(new RegExp("menu-item\\["+e[1]+"\\]","g"),"menu-item["+i+"]"))}}});b(".categorychecklist",c).html(h);b("img.waiting",c).hide()},removeMenuItem:function(d){var c=d.childMenuItems();d.addClass("deleting").animate({opacity:0,height:0},350,function(){var e=b("#menu-instructions");d.remove();c.shiftDepthClass(-1).updateParentMenuItemDBId();if(!e.siblings().length){e.removeClass("menu-instructions-inactive")}})},depthToPx:function(c){return c*a.options.menuItemDepthPerLevel},pxToDepth:function(c){return Math.floor(c/a.options.menuItemDepthPerLevel)}};b(document).ready(function(){wpNavMenu.init()})})(jQuery);
\ No newline at end of file
--- 1,965 ----
! /**
! * WordPress Administration Navigation Menu
! * Interface JS functions
! *
! * @version 2.0.0
! *
! * @package WordPress
! * @subpackage Administration
! */
!
! var wpNavMenu;
!
! (function($) {
!
! var api = wpNavMenu = {
!
! options : {
! menuItemDepthPerLevel : 30, // Do not use directly. Use depthToPx and pxToDepth instead.
! globalMaxDepth : 11
! },
!
! menuList : undefined, // Set in init.
! targetList : undefined, // Set in init.
! menusChanged : false,
! isRTL: !! ( 'undefined' != typeof isRtl && isRtl ),
! negateIfRTL: ( 'undefined' != typeof isRtl && isRtl ) ? -1 : 1,
!
! // Functions that run on init.
! init : function() {
! api.menuList = $('#menu-to-edit');
! api.targetList = api.menuList;
!
! this.jQueryExtensions();
!
! this.attachMenuEditListeners();
!
! this.setupInputWithDefaultTitle();
! this.attachQuickSearchListeners();
! this.attachThemeLocationsListeners();
!
! this.attachTabsPanelListeners();
!
! this.attachUnsavedChangesListener();
!
! if( api.menuList.length ) // If no menu, we're in the + tab.
! this.initSortables();
!
! this.initToggles();
!
! this.initTabManager();
! },
!
! jQueryExtensions : function() {
! // jQuery extensions
! $.fn.extend({
! menuItemDepth : function() {
! var margin = api.isRTL ? this.eq(0).css('margin-right') : this.eq(0).css('margin-left');
! return api.pxToDepth( margin && -1 != margin.indexOf('px') ? margin.slice(0, -2) : 0 );
! },
! updateDepthClass : function(current, prev) {
! return this.each(function(){
! var t = $(this);
! prev = prev || t.menuItemDepth();
! $(this).removeClass('menu-item-depth-'+ prev )
! .addClass('menu-item-depth-'+ current );
! });
! },
! shiftDepthClass : function(change) {
! return this.each(function(){
! var t = $(this),
! depth = t.menuItemDepth();
! $(this).removeClass('menu-item-depth-'+ depth )
! .addClass('menu-item-depth-'+ (depth + change) );
! });
! },
! childMenuItems : function() {
! var result = $();
! this.each(function(){
! var t = $(this), depth = t.menuItemDepth(), next = t.next();
! while( next.length && next.menuItemDepth() > depth ) {
! result = result.add( next );
! next = next.next();
! }
! });
! return result;
! },
! updateParentMenuItemDBId : function() {
! return this.each(function(){
! var item = $(this),
! input = item.find('.menu-item-data-parent-id'),
! depth = item.menuItemDepth(),
! parent = item.prev();
!
! if( depth == 0 ) { // Item is on the top level, has no parent
! input.val(0);
! } else { // Find the parent item, and retrieve its object id.
! while( ! parent[0] || ! parent[0].className || -1 == parent[0].className.indexOf('menu-item') || ( parent.menuItemDepth() != depth - 1 ) )
! parent = parent.prev();
! input.val( parent.find('.menu-item-data-db-id').val() );
! }
! });
! },
! hideAdvancedMenuItemFields : function() {
! return this.each(function(){
! var that = $(this);
! $('.hide-column-tog').not(':checked').each(function(){
! that.find('.field-' + $(this).val() ).addClass('hidden-field');
! });
! });
! },
! /**
! * Adds selected menu items to the menu.
! *
! * @param jQuery metabox The metabox jQuery object.
! */
! addSelectedToMenu : function(processMethod) {
! if ( 0 == $('#menu-to-edit').length ) {
! return false;
! }
!
! return this.each(function() {
! var t = $(this), menuItems = {},
! checkboxes = t.find('.tabs-panel-active .categorychecklist li input:checked'),
! re = new RegExp('menu-item\\[(\[^\\]\]*)');
!
! processMethod = processMethod || api.addMenuItemToBottom;
!
! // If no items are checked, bail.
! if ( !checkboxes.length )
! return false;
!
! // Show the ajax spinner
! t.find('.spinner').show();
!
! // Retrieve menu item data
! $(checkboxes).each(function(){
! var t = $(this),
! listItemDBIDMatch = re.exec( t.attr('name') ),
! listItemDBID = 'undefined' == typeof listItemDBIDMatch[1] ? 0 : parseInt(listItemDBIDMatch[1], 10);
! if ( this.className && -1 != this.className.indexOf('add-to-top') )
! processMethod = api.addMenuItemToTop;
! menuItems[listItemDBID] = t.closest('li').getItemData( 'add-menu-item', listItemDBID );
! });
!
! // Add the items
! api.addItemToMenu(menuItems, processMethod, function(){
! // Deselect the items and hide the ajax spinner
! checkboxes.removeAttr('checked');
! t.find('.spinner').hide();
! });
! });
! },
! getItemData : function( itemType, id ) {
! itemType = itemType || 'menu-item';
!
! var itemData = {}, i,
! fields = [
! 'menu-item-db-id',
! 'menu-item-object-id',
! 'menu-item-object',
! 'menu-item-parent-id',
! 'menu-item-position',
! 'menu-item-type',
! 'menu-item-title',
! 'menu-item-url',
! 'menu-item-description',
! 'menu-item-attr-title',
! 'menu-item-target',
! 'menu-item-classes',
! 'menu-item-xfn'
! ];
!
! if( !id && itemType == 'menu-item' ) {
! id = this.find('.menu-item-data-db-id').val();
! }
!
! if( !id ) return itemData;
!
! this.find('input').each(function() {
! var field;
! i = fields.length;
! while ( i-- ) {
! if( itemType == 'menu-item' )
! field = fields[i] + '[' + id + ']';
! else if( itemType == 'add-menu-item' )
! field = 'menu-item[' + id + '][' + fields[i] + ']';
!
! if (
! this.name &&
! field == this.name
! ) {
! itemData[fields[i]] = this.value;
! }
! }
! });
!
! return itemData;
! },
! setItemData : function( itemData, itemType, id ) { // Can take a type, such as 'menu-item', or an id.
! itemType = itemType || 'menu-item';
!
! if( !id && itemType == 'menu-item' ) {
! id = $('.menu-item-data-db-id', this).val();
! }
!
! if( !id ) return this;
!
! this.find('input').each(function() {
! var t = $(this), field;
! $.each( itemData, function( attr, val ) {
! if( itemType == 'menu-item' )
! field = attr + '[' + id + ']';
! else if( itemType == 'add-menu-item' )
! field = 'menu-item[' + id + '][' + attr + ']';
!
! if ( field == t.attr('name') ) {
! t.val( val );
! }
! });
! });
! return this;
! }
! });
! },
!
! initToggles : function() {
! // init postboxes
! postboxes.add_postbox_toggles('nav-menus');
!
! // adjust columns functions for menus UI
! columns.useCheckboxesForHidden();
! columns.checked = function(field) {
! $('.field-' + field).removeClass('hidden-field');
! }
! columns.unchecked = function(field) {
! $('.field-' + field).addClass('hidden-field');
! }
! // hide fields
! api.menuList.hideAdvancedMenuItemFields();
! },
!
! initSortables : function() {
! var currentDepth = 0, originalDepth, minDepth, maxDepth,
! prev, next, prevBottom, nextThreshold, helperHeight, transport,
! menuEdge = api.menuList.offset().left,
! body = $('body'), maxChildDepth,
! menuMaxDepth = initialMenuMaxDepth();
!
! // Use the right edge if RTL.
! menuEdge += api.isRTL ? api.menuList.width() : 0;
!
! api.menuList.sortable({
! handle: '.menu-item-handle',
! placeholder: 'sortable-placeholder',
! start: function(e, ui) {
! var height, width, parent, children, tempHolder;
!
! // handle placement for rtl orientation
! if ( api.isRTL )
! ui.item[0].style.right = 'auto';
!
! transport = ui.item.children('.menu-item-transport');
!
! // Set depths. currentDepth must be set before children are located.
! originalDepth = ui.item.menuItemDepth();
! updateCurrentDepth(ui, originalDepth);
!
! // Attach child elements to parent
! // Skip the placeholder
! parent = ( ui.item.next()[0] == ui.placeholder[0] ) ? ui.item.next() : ui.item;
! children = parent.childMenuItems();
! transport.append( children );
!
! // Update the height of the placeholder to match the moving item.
! height = transport.outerHeight();
! // If there are children, account for distance between top of children and parent
! height += ( height > 0 ) ? (ui.placeholder.css('margin-top').slice(0, -2) * 1) : 0;
! height += ui.helper.outerHeight();
! helperHeight = height;
! height -= 2; // Subtract 2 for borders
! ui.placeholder.height(height);
!
! // Update the width of the placeholder to match the moving item.
! maxChildDepth = originalDepth;
! children.each(function(){
! var depth = $(this).menuItemDepth();
! maxChildDepth = (depth > maxChildDepth) ? depth : maxChildDepth;
! });
! width = ui.helper.find('.menu-item-handle').outerWidth(); // Get original width
! width += api.depthToPx(maxChildDepth - originalDepth); // Account for children
! width -= 2; // Subtract 2 for borders
! ui.placeholder.width(width);
!
! // Update the list of menu items.
! tempHolder = ui.placeholder.next();
! tempHolder.css( 'margin-top', helperHeight + 'px' ); // Set the margin to absorb the placeholder
! ui.placeholder.detach(); // detach or jQuery UI will think the placeholder is a menu item
! $(this).sortable( "refresh" ); // The children aren't sortable. We should let jQ UI know.
! ui.item.after( ui.placeholder ); // reattach the placeholder.
! tempHolder.css('margin-top', 0); // reset the margin
!
! // Now that the element is complete, we can update...
! updateSharedVars(ui);
! },
! stop: function(e, ui) {
! var children, depthChange = currentDepth - originalDepth;
!
! // Return child elements to the list
! children = transport.children().insertAfter(ui.item);
!
! // Update depth classes
! if( depthChange != 0 ) {
! ui.item.updateDepthClass( currentDepth );
! children.shiftDepthClass( depthChange );
! updateMenuMaxDepth( depthChange );
! }
! // Register a change
! api.registerChange();
! // Update the item data.
! ui.item.updateParentMenuItemDBId();
!
! // address sortable's incorrectly-calculated top in opera
! ui.item[0].style.top = 0;
!
! // handle drop placement for rtl orientation
! if ( api.isRTL ) {
! ui.item[0].style.left = 'auto';
! ui.item[0].style.right = 0;
! }
!
! // The width of the tab bar might have changed. Just in case.
! api.refreshMenuTabs( true );
! },
! change: function(e, ui) {
! // Make sure the placeholder is inside the menu.
! // Otherwise fix it, or we're in trouble.
! if( ! ui.placeholder.parent().hasClass('menu') )
! (prev.length) ? prev.after( ui.placeholder ) : api.menuList.prepend( ui.placeholder );
!
! updateSharedVars(ui);
! },
! sort: function(e, ui) {
! var offset = ui.helper.offset(),
! edge = api.isRTL ? offset.left + ui.helper.width() : offset.left,
! depth = api.negateIfRTL * api.pxToDepth( edge - menuEdge );
! // Check and correct if depth is not within range.
! // Also, if the dragged element is dragged upwards over
! // an item, shift the placeholder to a child position.
! if ( depth > maxDepth || offset.top < prevBottom ) depth = maxDepth;
! else if ( depth < minDepth ) depth = minDepth;
!
! if( depth != currentDepth )
! updateCurrentDepth(ui, depth);
!
! // If we overlap the next element, manually shift downwards
! if( nextThreshold && offset.top + helperHeight > nextThreshold ) {
! next.after( ui.placeholder );
! updateSharedVars( ui );
! $(this).sortable( "refreshPositions" );
! }
! }
! });
!
! function updateSharedVars(ui) {
! var depth;
!
! prev = ui.placeholder.prev();
! next = ui.placeholder.next();
!
! // Make sure we don't select the moving item.
! if( prev[0] == ui.item[0] ) prev = prev.prev();
! if( next[0] == ui.item[0] ) next = next.next();
!
! prevBottom = (prev.length) ? prev.offset().top + prev.height() : 0;
! nextThreshold = (next.length) ? next.offset().top + next.height() / 3 : 0;
! minDepth = (next.length) ? next.menuItemDepth() : 0;
!
! if( prev.length )
! maxDepth = ( (depth = prev.menuItemDepth() + 1) > api.options.globalMaxDepth ) ? api.options.globalMaxDepth : depth;
! else
! maxDepth = 0;
! }
!
! function updateCurrentDepth(ui, depth) {
! ui.placeholder.updateDepthClass( depth, currentDepth );
! currentDepth = depth;
! }
!
! function initialMenuMaxDepth() {
! if( ! body[0].className ) return 0;
! var match = body[0].className.match(/menu-max-depth-(\d+)/);
! return match && match[1] ? parseInt(match[1]) : 0;
! }
!
! function updateMenuMaxDepth( depthChange ) {
! var depth, newDepth = menuMaxDepth;
! if ( depthChange === 0 ) {
! return;
! } else if ( depthChange > 0 ) {
! depth = maxChildDepth + depthChange;
! if( depth > menuMaxDepth )
! newDepth = depth;
! } else if ( depthChange < 0 && maxChildDepth == menuMaxDepth ) {
! while( ! $('.menu-item-depth-' + newDepth, api.menuList).length && newDepth > 0 )
! newDepth--;
! }
! // Update the depth class.
! body.removeClass( 'menu-max-depth-' + menuMaxDepth ).addClass( 'menu-max-depth-' + newDepth );
! menuMaxDepth = newDepth;
! }
! },
!
! attachMenuEditListeners : function() {
! var that = this;
! $('#update-nav-menu').bind('click', function(e) {
! if ( e.target && e.target.className ) {
! if ( -1 != e.target.className.indexOf('item-edit') ) {
! return that.eventOnClickEditLink(e.target);
! } else if ( -1 != e.target.className.indexOf('menu-save') ) {
! return that.eventOnClickMenuSave(e.target);
! } else if ( -1 != e.target.className.indexOf('menu-delete') ) {
! return that.eventOnClickMenuDelete(e.target);
! } else if ( -1 != e.target.className.indexOf('item-delete') ) {
! return that.eventOnClickMenuItemDelete(e.target);
! } else if ( -1 != e.target.className.indexOf('item-cancel') ) {
! return that.eventOnClickCancelLink(e.target);
! }
! }
! });
! $('#add-custom-links input[type="text"]').keypress(function(e){
! if ( e.keyCode === 13 ) {
! e.preventDefault();
! $("#submit-customlinkdiv").click();
! }
! });
! },
!
! /**
! * An interface for managing default values for input elements
! * that is both JS and accessibility-friendly.
! *
! * Input elements that add the class 'input-with-default-title'
! * will have their values set to the provided HTML title when empty.
! */
! setupInputWithDefaultTitle : function() {
! var name = 'input-with-default-title';
!
! $('.' + name).each( function(){
! var $t = $(this), title = $t.attr('title'), val = $t.val();
! $t.data( name, title );
!
! if( '' == val ) $t.val( title );
! else if ( title == val ) return;
! else $t.removeClass( name );
! }).focus( function(){
! var $t = $(this);
! if( $t.val() == $t.data(name) )
! $t.val('').removeClass( name );
! }).blur( function(){
! var $t = $(this);
! if( '' == $t.val() )
! $t.addClass( name ).val( $t.data(name) );
! });
! },
!
! attachThemeLocationsListeners : function() {
! var loc = $('#nav-menu-theme-locations'), params = {};
! params['action'] = 'menu-locations-save';
! params['menu-settings-column-nonce'] = $('#menu-settings-column-nonce').val();
! loc.find('input[type="submit"]').click(function() {
! loc.find('select').each(function() {
! params[this.name] = $(this).val();
! });
! loc.find('.spinner').show();
! $.post( ajaxurl, params, function(r) {
! loc.find('.spinner').hide();
! });
! return false;
! });
! },
!
! attachQuickSearchListeners : function() {
! var searchTimer;
!
! $('.quick-search').keypress(function(e){
! var t = $(this);
!
! if( 13 == e.which ) {
! api.updateQuickSearchResults( t );
! return false;
! }
!
! if( searchTimer ) clearTimeout(searchTimer);
!
! searchTimer = setTimeout(function(){
! api.updateQuickSearchResults( t );
! }, 400);
! }).attr('autocomplete','off');
! },
!
! updateQuickSearchResults : function(input) {
! var panel, params,
! minSearchLength = 2,
! q = input.val();
!
! if( q.length < minSearchLength ) return;
!
! panel = input.parents('.tabs-panel');
! params = {
! 'action': 'menu-quick-search',
! 'response-format': 'markup',
! 'menu': $('#menu').val(),
! 'menu-settings-column-nonce': $('#menu-settings-column-nonce').val(),
! 'q': q,
! 'type': input.attr('name')
! };
!
! $('.spinner', panel).show();
!
! $.post( ajaxurl, params, function(menuMarkup) {
! api.processQuickSearchQueryResponse(menuMarkup, params, panel);
! });
! },
!
! addCustomLink : function( processMethod ) {
! var url = $('#custom-menu-item-url').val(),
! label = $('#custom-menu-item-name').val();
!
! processMethod = processMethod || api.addMenuItemToBottom;
!
! if ( '' == url || 'http://' == url )
! return false;
!
! // Show the ajax spinner
! $('.customlinkdiv .spinner').show();
! this.addLinkToMenu( url, label, processMethod, function() {
! // Remove the ajax spinner
! $('.customlinkdiv .spinner').hide();
! // Set custom link form back to defaults
! $('#custom-menu-item-name').val('').blur();
! $('#custom-menu-item-url').val('http://');
! });
! },
!
! addLinkToMenu : function(url, label, processMethod, callback) {
! processMethod = processMethod || api.addMenuItemToBottom;
! callback = callback || function(){};
!
! api.addItemToMenu({
! '-1': {
! 'menu-item-type': 'custom',
! 'menu-item-url': url,
! 'menu-item-title': label
! }
! }, processMethod, callback);
! },
!
! addItemToMenu : function(menuItem, processMethod, callback) {
! var menu = $('#menu').val(),
! nonce = $('#menu-settings-column-nonce').val();
!
! processMethod = processMethod || function(){};
! callback = callback || function(){};
!
! params = {
! 'action': 'add-menu-item',
! 'menu': menu,
! 'menu-settings-column-nonce': nonce,
! 'menu-item': menuItem
! };
!
! $.post( ajaxurl, params, function(menuMarkup) {
! var ins = $('#menu-instructions');
! processMethod(menuMarkup, params);
! if( ! ins.hasClass('menu-instructions-inactive') && ins.siblings().length )
! ins.addClass('menu-instructions-inactive');
! callback();
! });
! },
!
! /**
! * Process the add menu item request response into menu list item.
! *
! * @param string menuMarkup The text server response of menu item markup.
! * @param object req The request arguments.
! */
! addMenuItemToBottom : function( menuMarkup, req ) {
! $(menuMarkup).hideAdvancedMenuItemFields().appendTo( api.targetList );
! },
!
! addMenuItemToTop : function( menuMarkup, req ) {
! $(menuMarkup).hideAdvancedMenuItemFields().prependTo( api.targetList );
! },
!
! attachUnsavedChangesListener : function() {
! $('#menu-management input, #menu-management select, #menu-management, #menu-management textarea').change(function(){
! api.registerChange();
! });
!
! if ( 0 != $('#menu-to-edit').length ) {
! window.onbeforeunload = function(){
! if ( api.menusChanged )
! return navMenuL10n.saveAlert;
! };
! } else {
! // Make the post boxes read-only, as they can't be used yet
! $('#menu-settings-column').find('input,select').prop('disabled', true).end().find('a').attr('href', '#').unbind('click');
! }
! },
!
! registerChange : function() {
! api.menusChanged = true;
! },
!
! attachTabsPanelListeners : function() {
! $('#menu-settings-column').bind('click', function(e) {
! var selectAreaMatch, panelId, wrapper, items,
! target = $(e.target);
!
! if ( target.hasClass('nav-tab-link') ) {
! panelId = /#(.*)$/.exec(e.target.href);
! if ( panelId && panelId[1] )
! panelId = panelId[1]
! else
! return false;
!
! wrapper = target.parents('.inside').first();
!
! // upon changing tabs, we want to uncheck all checkboxes
! $('input', wrapper).removeAttr('checked');
!
! $('.tabs-panel-active', wrapper).removeClass('tabs-panel-active').addClass('tabs-panel-inactive');
! $('#' + panelId, wrapper).removeClass('tabs-panel-inactive').addClass('tabs-panel-active');
!
! $('.tabs', wrapper).removeClass('tabs');
! target.parent().addClass('tabs');
!
! // select the search bar
! $('.quick-search', wrapper).focus();
!
! return false;
! } else if ( target.hasClass('select-all') ) {
! selectAreaMatch = /#(.*)$/.exec(e.target.href);
! if ( selectAreaMatch && selectAreaMatch[1] ) {
! items = $('#' + selectAreaMatch[1] + ' .tabs-panel-active .menu-item-title input');
! if( items.length === items.filter(':checked').length )
! items.removeAttr('checked');
! else
! items.prop('checked', true);
! return false;
! }
! } else if ( target.hasClass('submit-add-to-menu') ) {
! api.registerChange();
!
! if ( e.target.id && 'submit-customlinkdiv' == e.target.id )
! api.addCustomLink( api.addMenuItemToBottom );
! else if ( e.target.id && -1 != e.target.id.indexOf('submit-') )
! $('#' + e.target.id.replace(/submit-/, '')).addSelectedToMenu( api.addMenuItemToBottom );
! return false;
! } else if ( target.hasClass('page-numbers') ) {
! $.post( ajaxurl, e.target.href.replace(/.*\?/, '').replace(/action=([^&]*)/, '') + '&action=menu-get-metabox',
! function( resp ) {
! if ( -1 == resp.indexOf('replace-id') )
! return;
!
! var metaBoxData = $.parseJSON(resp),
! toReplace = document.getElementById(metaBoxData['replace-id']),
! placeholder = document.createElement('div'),
! wrap = document.createElement('div');
!
! if ( ! metaBoxData['markup'] || ! toReplace )
! return;
!
! wrap.innerHTML = metaBoxData['markup'] ? metaBoxData['markup'] : '';
!
! toReplace.parentNode.insertBefore( placeholder, toReplace );
! placeholder.parentNode.removeChild( toReplace );
!
! placeholder.parentNode.insertBefore( wrap, placeholder );
!
! placeholder.parentNode.removeChild( placeholder );
!
! }
! );
!
! return false;
! }
! });
! },
!
! initTabManager : function() {
! var fixed = $('.nav-tabs-wrapper'),
! fluid = fixed.children('.nav-tabs'),
! active = fluid.children('.nav-tab-active'),
! tabs = fluid.children('.nav-tab'),
! tabsWidth = 0,
! fixedRight, fixedLeft,
! arrowLeft, arrowRight, resizeTimer, css = {},
! marginFluid = api.isRTL ? 'margin-right' : 'margin-left',
! marginFixed = api.isRTL ? 'margin-left' : 'margin-right',
! msPerPx = 2;
!
! /**
! * Refreshes the menu tabs.
! * Will show and hide arrows where necessary.
! * Scrolls to the active tab by default.
! *
! * @param savePosition {boolean} Optional. Prevents scrolling so
! * that the current position is maintained. Default false.
! **/
! api.refreshMenuTabs = function( savePosition ) {
! var fixedWidth = fixed.width(),
! margin = 0, css = {};
! fixedLeft = fixed.offset().left;
! fixedRight = fixedLeft + fixedWidth;
!
! if( !savePosition )
! active.makeTabVisible();
!
! // Prevent space from building up next to the last tab if there's more to show
! if( tabs.last().isTabVisible() ) {
! margin = fixed.width() - tabsWidth;
! margin = margin > 0 ? 0 : margin;
! css[marginFluid] = margin + 'px';
! fluid.animate( css, 100, "linear" );
! }
!
! // Show the arrows only when necessary
! if( fixedWidth > tabsWidth )
! arrowLeft.add( arrowRight ).hide();
! else
! arrowLeft.add( arrowRight ).show();
! }
!
! $.fn.extend({
! makeTabVisible : function() {
! var t = this.eq(0), left, right, css = {}, shift = 0;
!
! if( ! t.length ) return this;
!
! left = t.offset().left;
! right = left + t.outerWidth();
!
! if( right > fixedRight )
! shift = fixedRight - right;
! else if ( left < fixedLeft )
! shift = fixedLeft - left;
!
! if( ! shift ) return this;
!
! css[marginFluid] = "+=" + api.negateIfRTL * shift + 'px';
! fluid.animate( css, Math.abs( shift ) * msPerPx, "linear" );
! return this;
! },
! isTabVisible : function() {
! var t = this.eq(0),
! left = t.offset().left,
! right = left + t.outerWidth();
! return ( right <= fixedRight && left >= fixedLeft ) ? true : false;
! }
! });
!
! // Find the width of all tabs
! tabs.each(function(){
! tabsWidth += $(this).outerWidth(true);
! });
!
! // Set up fixed margin for overflow, unset padding
! css['padding'] = 0;
! css[marginFixed] = (-1 * tabsWidth) + 'px';
! fluid.css( css );
!
! // Build tab navigation
! arrowLeft = $('
');
! arrowRight = $('
');
! // Attach to the document
! fixed.wrap('
').parent().prepend( arrowLeft ).append( arrowRight );
!
! // Set the menu tabs
! api.refreshMenuTabs();
! // Make sure the tabs reset on resize
! $(window).resize(function() {
! if( resizeTimer ) clearTimeout(resizeTimer);
! resizeTimer = setTimeout( api.refreshMenuTabs, 200);
! });
!
! // Build arrow functions
! $.each([{
! arrow : arrowLeft,
! next : "next",
! last : "first",
! operator : "+="
! },{
! arrow : arrowRight,
! next : "prev",
! last : "last",
! operator : "-="
! }], function(){
! var that = this;
! this.arrow.mousedown(function(){
! var marginFluidVal = Math.abs( parseInt( fluid.css(marginFluid) ) ),
! shift = marginFluidVal,
! css = {};
!
! if( "-=" == that.operator )
! shift = Math.abs( tabsWidth - fixed.width() ) - marginFluidVal;
!
! if( ! shift ) return;
!
! css[marginFluid] = that.operator + shift + 'px';
! fluid.animate( css, shift * msPerPx, "linear" );
! }).mouseup(function(){
! var tab, next;
! fluid.stop(true);
! tab = tabs[that.last]();
! while( (next = tab[that.next]()) && next.length && ! next.isTabVisible() ) {
! tab = next;
! }
! tab.makeTabVisible();
! });
! });
! },
!
! eventOnClickEditLink : function(clickedEl) {
! var settings, item,
! matchedSection = /#(.*)$/.exec(clickedEl.href);
! if ( matchedSection && matchedSection[1] ) {
! settings = $('#'+matchedSection[1]);
! item = settings.parent();
! if( 0 != item.length ) {
! if( item.hasClass('menu-item-edit-inactive') ) {
! if( ! settings.data('menu-item-data') ) {
! settings.data( 'menu-item-data', settings.getItemData() );
! }
! settings.slideDown('fast');
! item.removeClass('menu-item-edit-inactive')
! .addClass('menu-item-edit-active');
! } else {
! settings.slideUp('fast');
! item.removeClass('menu-item-edit-active')
! .addClass('menu-item-edit-inactive');
! }
! return false;
! }
! }
! },
!
! eventOnClickCancelLink : function(clickedEl) {
! var settings = $(clickedEl).closest('.menu-item-settings');
! settings.setItemData( settings.data('menu-item-data') );
! return false;
! },
!
! eventOnClickMenuSave : function(clickedEl) {
! var locs = '',
! menuName = $('#menu-name'),
! menuNameVal = menuName.val();
! // Cancel and warn if invalid menu name
! if( !menuNameVal || menuNameVal == menuName.attr('title') || !menuNameVal.replace(/\s+/, '') ) {
! menuName.parent().addClass('form-invalid');
! return false;
! }
! // Copy menu theme locations
! $('#nav-menu-theme-locations select').each(function() {
! locs += '
';
! });
! $('#update-nav-menu').append( locs );
! // Update menu item position data
! api.menuList.find('.menu-item-data-position').val( function(index) { return index + 1; } );
! window.onbeforeunload = null;
!
! return true;
! },
!
! eventOnClickMenuDelete : function(clickedEl) {
! // Delete warning AYS
! if ( confirm( navMenuL10n.warnDeleteMenu ) ) {
! window.onbeforeunload = null;
! return true;
! }
! return false;
! },
!
! eventOnClickMenuItemDelete : function(clickedEl) {
! var itemID = parseInt(clickedEl.id.replace('delete-', ''), 10);
! api.removeMenuItem( $('#menu-item-' + itemID) );
! api.registerChange();
! return false;
! },
!
! /**
! * Process the quick search response into a search result
! *
! * @param string resp The server response to the query.
! * @param object req The request arguments.
! * @param jQuery panel The tabs panel we're searching in.
! */
! processQuickSearchQueryResponse : function(resp, req, panel) {
! var matched, newID,
! takenIDs = {},
! form = document.getElementById('nav-menu-meta'),
! pattern = new RegExp('menu-item\\[(\[^\\]\]*)', 'g'),
! $items = $('
').html(resp).find('li'),
! $item;
!
! if( ! $items.length ) {
! $('.categorychecklist', panel).html( '
' + navMenuL10n.noResultsFound + '
' );
! $('.spinner', panel).hide();
! return;
! }
!
! $items.each(function(){
! $item = $(this);
!
! // make a unique DB ID number
! matched = pattern.exec($item.html());
!
! if ( matched && matched[1] ) {
! newID = matched[1];
! while( form.elements['menu-item[' + newID + '][menu-item-type]'] || takenIDs[ newID ] ) {
! newID--;
! }
!
! takenIDs[newID] = true;
! if ( newID != matched[1] ) {
! $item.html( $item.html().replace(new RegExp(
! 'menu-item\\[' + matched[1] + '\\]', 'g'),
! 'menu-item[' + newID + ']'
! ) );
! }
! }
! });
!
! $('.categorychecklist', panel).html( $items );
! $('.spinner', panel).hide();
! },
!
! removeMenuItem : function(el) {
! var children = el.childMenuItems();
!
! el.addClass('deleting').animate({
! opacity : 0,
! height: 0
! }, 350, function() {
! var ins = $('#menu-instructions');
! el.remove();
! children.shiftDepthClass(-1).updateParentMenuItemDBId();
! if( ! ins.siblings().length )
! ins.removeClass('menu-instructions-inactive');
! });
! },
!
! depthToPx : function(depth) {
! return depth * api.options.menuItemDepthPerLevel;
! },
!
! pxToDepth : function(px) {
! return Math.floor(px / api.options.menuItemDepthPerLevel);
! }
!
! };
!
! $(document).ready(function(){ wpNavMenu.init(); });
!
! })(jQuery);
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/nav-menu.min.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/nav-menu.min.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/nav-menu.min.js 1969-12-31 17:00:00.000000000 -0700
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/nav-menu.min.js 2012-09-26 17:58:46.000000000 -0500
***************
*** 0 ****
--- 1 ----
+ var wpNavMenu;(function(b){var a=wpNavMenu={options:{menuItemDepthPerLevel:30,globalMaxDepth:11},menuList:undefined,targetList:undefined,menusChanged:false,isRTL:!!("undefined"!=typeof isRtl&&isRtl),negateIfRTL:("undefined"!=typeof isRtl&&isRtl)?-1:1,init:function(){a.menuList=b("#menu-to-edit");a.targetList=a.menuList;this.jQueryExtensions();this.attachMenuEditListeners();this.setupInputWithDefaultTitle();this.attachQuickSearchListeners();this.attachThemeLocationsListeners();this.attachTabsPanelListeners();this.attachUnsavedChangesListener();if(a.menuList.length){this.initSortables()}this.initToggles();this.initTabManager()},jQueryExtensions:function(){b.fn.extend({menuItemDepth:function(){var c=a.isRTL?this.eq(0).css("margin-right"):this.eq(0).css("margin-left");return a.pxToDepth(c&&-1!=c.indexOf("px")?c.slice(0,-2):0)},updateDepthClass:function(d,c){return this.each(function(){var e=b(this);c=c||e.menuItemDepth();b(this).removeClass("menu-item-depth-"+c).addClass("menu-item-depth-"+d)})},shiftDepthClass:function(c){return this.each(function(){var d=b(this),e=d.menuItemDepth();b(this).removeClass("menu-item-depth-"+e).addClass("menu-item-depth-"+(e+c))})},childMenuItems:function(){var c=b();this.each(function(){var d=b(this),f=d.menuItemDepth(),e=d.next();while(e.length&&e.menuItemDepth()>f){c=c.add(e);e=e.next()}});return c},updateParentMenuItemDBId:function(){return this.each(function(){var e=b(this),c=e.find(".menu-item-data-parent-id"),f=e.menuItemDepth(),d=e.prev();if(f==0){c.val(0)}else{while(!d[0]||!d[0].className||-1==d[0].className.indexOf("menu-item")||(d.menuItemDepth()!=f-1)){d=d.prev()}c.val(d.find(".menu-item-data-db-id").val())}})},hideAdvancedMenuItemFields:function(){return this.each(function(){var c=b(this);b(".hide-column-tog").not(":checked").each(function(){c.find(".field-"+b(this).val()).addClass("hidden-field")})})},addSelectedToMenu:function(c){if(0==b("#menu-to-edit").length){return false}return this.each(function(){var e=b(this),d={},g=e.find(".tabs-panel-active .categorychecklist li input:checked"),f=new RegExp("menu-item\\[([^\\]]*)");c=c||a.addMenuItemToBottom;if(!g.length){return false}e.find(".spinner").show();b(g).each(function(){var i=b(this),h=f.exec(i.attr("name")),j="undefined"==typeof h[1]?0:parseInt(h[1],10);if(this.className&&-1!=this.className.indexOf("add-to-top")){c=a.addMenuItemToTop}d[j]=i.closest("li").getItemData("add-menu-item",j)});a.addItemToMenu(d,c,function(){g.removeAttr("checked");e.find(".spinner").hide()})})},getItemData:function(f,g){f=f||"menu-item";var d={},e,c=["menu-item-db-id","menu-item-object-id","menu-item-object","menu-item-parent-id","menu-item-position","menu-item-type","menu-item-title","menu-item-url","menu-item-description","menu-item-attr-title","menu-item-target","menu-item-classes","menu-item-xfn"];if(!g&&f=="menu-item"){g=this.find(".menu-item-data-db-id").val()}if(!g){return d}this.find("input").each(function(){var h;e=c.length;while(e--){if(f=="menu-item"){h=c[e]+"["+g+"]"}else{if(f=="add-menu-item"){h="menu-item["+g+"]["+c[e]+"]"}}if(this.name&&h==this.name){d[c[e]]=this.value}}});return d},setItemData:function(c,d,e){d=d||"menu-item";if(!e&&d=="menu-item"){e=b(".menu-item-data-db-id",this).val()}if(!e){return this}this.find("input").each(function(){var f=b(this),g;b.each(c,function(h,i){if(d=="menu-item"){g=h+"["+e+"]"}else{if(d=="add-menu-item"){g="menu-item["+e+"]["+h+"]"}}if(g==f.attr("name")){f.val(i)}})});return this}})},initToggles:function(){postboxes.add_postbox_toggles("nav-menus");columns.useCheckboxesForHidden();columns.checked=function(c){b(".field-"+c).removeClass("hidden-field")};columns.unchecked=function(c){b(".field-"+c).addClass("hidden-field")};a.menuList.hideAdvancedMenuItemFields()},initSortables:function(){var p=0,e,t,d,l,o,f,c,i,s,m=a.menuList.offset().left,h=b("body"),q,n=r();m+=a.isRTL?a.menuList.width():0;a.menuList.sortable({handle:".menu-item-handle",placeholder:"sortable-placeholder",start:function(A,z){var u,x,w,v,y;if(a.isRTL){z.item[0].style.right="auto"}s=z.item.children(".menu-item-transport");e=z.item.menuItemDepth();j(z,e);w=(z.item.next()[0]==z.placeholder[0])?z.item.next():z.item;v=w.childMenuItems();s.append(v);u=s.outerHeight();u+=(u>0)?(z.placeholder.css("margin-top").slice(0,-2)*1):0;u+=z.helper.outerHeight();i=u;u-=2;z.placeholder.height(u);q=e;v.each(function(){var B=b(this).menuItemDepth();q=(B>q)?B:q});x=z.helper.find(".menu-item-handle").outerWidth();x+=a.depthToPx(q-e);x-=2;z.placeholder.width(x);y=z.placeholder.next();y.css("margin-top",i+"px");z.placeholder.detach();b(this).sortable("refresh");z.item.after(z.placeholder);y.css("margin-top",0);k(z)},stop:function(x,w){var v,u=p-e;v=s.children().insertAfter(w.item);if(u!=0){w.item.updateDepthClass(p);v.shiftDepthClass(u);g(u)}a.registerChange();w.item.updateParentMenuItemDBId();w.item[0].style.top=0;if(a.isRTL){w.item[0].style.left="auto";w.item[0].style.right=0}a.refreshMenuTabs(true)},change:function(v,u){if(!u.placeholder.parent().hasClass("menu")){(l.length)?l.after(u.placeholder):a.menuList.prepend(u.placeholder)}k(u)},sort:function(w,v){var y=v.helper.offset(),u=a.isRTL?y.left+v.helper.width():y.left,x=a.negateIfRTL*a.pxToDepth(u-m);if(x>d||y.top
c){o.after(v.placeholder);k(v);b(this).sortable("refreshPositions")}}});function k(u){var v;l=u.placeholder.prev();o=u.placeholder.next();if(l[0]==u.item[0]){l=l.prev()}if(o[0]==u.item[0]){o=o.next()}f=(l.length)?l.offset().top+l.height():0;c=(o.length)?o.offset().top+o.height()/3:0;t=(o.length)?o.menuItemDepth():0;if(l.length){d=((v=l.menuItemDepth()+1)>a.options.globalMaxDepth)?a.options.globalMaxDepth:v}else{d=0}}function j(u,v){u.placeholder.updateDepthClass(v,p);p=v}function r(){if(!h[0].className){return 0}var u=h[0].className.match(/menu-max-depth-(\d+)/);return u&&u[1]?parseInt(u[1]):0}function g(u){var v,w=n;if(u===0){return}else{if(u>0){v=q+u;if(v>n){w=v}}else{if(u<0&&q==n){while(!b(".menu-item-depth-"+w,a.menuList).length&&w>0){w--}}}}h.removeClass("menu-max-depth-"+n).addClass("menu-max-depth-"+w);n=w}},attachMenuEditListeners:function(){var c=this;b("#update-nav-menu").bind("click",function(d){if(d.target&&d.target.className){if(-1!=d.target.className.indexOf("item-edit")){return c.eventOnClickEditLink(d.target)}else{if(-1!=d.target.className.indexOf("menu-save")){return c.eventOnClickMenuSave(d.target)}else{if(-1!=d.target.className.indexOf("menu-delete")){return c.eventOnClickMenuDelete(d.target)}else{if(-1!=d.target.className.indexOf("item-delete")){return c.eventOnClickMenuItemDelete(d.target)}else{if(-1!=d.target.className.indexOf("item-cancel")){return c.eventOnClickCancelLink(d.target)}}}}}}});b('#add-custom-links input[type="text"]').keypress(function(d){if(d.keyCode===13){d.preventDefault();b("#submit-customlinkdiv").click()}})},setupInputWithDefaultTitle:function(){var c="input-with-default-title";b("."+c).each(function(){var f=b(this),e=f.attr("title"),d=f.val();f.data(c,e);if(""==d){f.val(e)}else{if(e==d){return}else{f.removeClass(c)}}}).focus(function(){var d=b(this);if(d.val()==d.data(c)){d.val("").removeClass(c)}}).blur(function(){var d=b(this);if(""==d.val()){d.addClass(c).val(d.data(c))}})},attachThemeLocationsListeners:function(){var d=b("#nav-menu-theme-locations"),c={};c.action="menu-locations-save";c["menu-settings-column-nonce"]=b("#menu-settings-column-nonce").val();d.find('input[type="submit"]').click(function(){d.find("select").each(function(){c[this.name]=b(this).val()});d.find(".spinner").show();b.post(ajaxurl,c,function(e){d.find(".spinner").hide()});return false})},attachQuickSearchListeners:function(){var c;b(".quick-search").keypress(function(f){var d=b(this);if(13==f.which){a.updateQuickSearchResults(d);return false}if(c){clearTimeout(c)}c=setTimeout(function(){a.updateQuickSearchResults(d)},400)}).attr("autocomplete","off")},updateQuickSearchResults:function(d){var c,g,e=2,f=d.val();if(f.length0?0:s;r[c]=s+"px";j.animate(r,100,"linear")}if(t>e){l.add(d).hide()}else{l.add(d).show()}};b.fn.extend({makeTabVisible:function(){var u=this.eq(0),v,s,r={},q=0;if(!u.length){return this}v=u.offset().left;s=v+u.outerWidth();if(s>o){q=o-s}else{if(v=f)?true:false}});m.each(function(){e+=b(this).outerWidth(true)});i.padding=0;i[p]=(-1*e)+"px";j.css(i);l=b('');d=b('');h.wrap('
').parent().prepend(l).append(d);a.refreshMenuTabs();b(window).resize(function(){if(k){clearTimeout(k)}k=setTimeout(a.refreshMenuTabs,200)});b.each([{arrow:l,next:"next",last:"first",operator:"+="},{arrow:d,next:"prev",last:"last",operator:"-="}],function(){var q=this;this.arrow.mousedown(function(){var t=Math.abs(parseInt(j.css(c))),r=t,s={};if("-="==q.operator){r=Math.abs(e-h.width())-t}if(!r){return}s[c]=q.operator+r+"px";j.animate(s,r*n,"linear")}).mouseup(function(){var s,r;j.stop(true);s=m[q.last]();while((r=s[q.next]())&&r.length&&!r.isTabVisible()){s=r}s.makeTabVisible()})})},eventOnClickEditLink:function(d){var c,e,f=/#(.*)$/.exec(d.href);if(f&&f[1]){c=b("#"+f[1]);e=c.parent();if(0!=e.length){if(e.hasClass("menu-item-edit-inactive")){if(!c.data("menu-item-data")){c.data("menu-item-data",c.getItemData())}c.slideDown("fast");e.removeClass("menu-item-edit-inactive").addClass("menu-item-edit-active")}else{c.slideUp("fast");e.removeClass("menu-item-edit-active").addClass("menu-item-edit-inactive")}return false}}},eventOnClickCancelLink:function(d){var c=b(d).closest(".menu-item-settings");c.setItemData(c.data("menu-item-data"));return false},eventOnClickMenuSave:function(e){var f="",c=b("#menu-name"),d=c.val();if(!d||d==c.attr("title")||!d.replace(/\s+/,"")){c.parent().addClass("form-invalid");return false}b("#nav-menu-theme-locations select").each(function(){f+='").html(g).find("li"),l;if(!h.length){b(".categorychecklist",c).html("
"+navMenuL10n.noResultsFound+"
");b(".spinner",c).hide();return}h.each(function(){l=b(this);e=j.exec(l.html());if(e&&e[1]){i=e[1];while(d.elements["menu-item["+i+"][menu-item-type]"]||f[i]){i--}f[i]=true;if(i!=e[1]){l.html(l.html().replace(new RegExp("menu-item\\["+e[1]+"\\]","g"),"menu-item["+i+"]"))}}});b(".categorychecklist",c).html(h);b(".spinner",c).hide()},removeMenuItem:function(d){var c=d.childMenuItems();d.addClass("deleting").animate({opacity:0,height:0},350,function(){var e=b("#menu-instructions");d.remove();c.shiftDepthClass(-1).updateParentMenuItemDBId();if(!e.siblings().length){e.removeClass("menu-instructions-inactive")}})},depthToPx:function(c){return c*a.options.menuItemDepthPerLevel},pxToDepth:function(c){return Math.floor(c/a.options.menuItemDepthPerLevel)}};b(document).ready(function(){wpNavMenu.init()})})(jQuery);
\ No newline at end of file
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/password-strength-meter.dev.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/password-strength-meter.dev.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/password-strength-meter.dev.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/password-strength-meter.dev.js 1969-12-31 17:00:00.000000000 -0700
***************
*** 1,36 ****
- // Password strength meter
- function passwordStrength(password1, username, password2) {
- var shortPass = 1, badPass = 2, goodPass = 3, strongPass = 4, mismatch = 5, symbolSize = 0, natLog, score;
-
- // password 1 != password 2
- if ( (password1 != password2) && password2.length > 0)
- return mismatch
-
- //password < 4
- if ( password1.length < 4 )
- return shortPass
-
- //password1 == username
- if ( password1.toLowerCase() == username.toLowerCase() )
- return badPass;
-
- if ( password1.match(/[0-9]/) )
- symbolSize +=10;
- if ( password1.match(/[a-z]/) )
- symbolSize +=26;
- if ( password1.match(/[A-Z]/) )
- symbolSize +=26;
- if ( password1.match(/[^a-zA-Z0-9]/) )
- symbolSize +=31;
-
- natLog = Math.log( Math.pow(symbolSize, password1.length) );
- score = natLog / Math.LN2;
-
- if (score < 40 )
- return badPass
-
- if (score < 56 )
- return goodPass
-
- return strongPass;
- }
--- 0 ----
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/password-strength-meter.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/password-strength-meter.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/password-strength-meter.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/password-strength-meter.js 2012-08-22 19:04:18.000000000 -0500
***************
*** 1 ****
! function passwordStrength(f,i,d){var k=1,h=2,b=3,a=4,c=5,g=0,j,e;if((f!=d)&&d.length>0){return c}if(f.length<4){return k}if(f.toLowerCase()==i.toLowerCase()){return h}if(f.match(/[0-9]/)){g+=10}if(f.match(/[a-z]/)){g+=26}if(f.match(/[A-Z]/)){g+=26}if(f.match(/[^a-zA-Z0-9]/)){g+=31}j=Math.log(Math.pow(g,f.length));e=j/Math.LN2;if(e<40){return h}if(e<56){return b}return a};
\ No newline at end of file
--- 1,36 ----
! // Password strength meter
! function passwordStrength(password1, username, password2) {
! var shortPass = 1, badPass = 2, goodPass = 3, strongPass = 4, mismatch = 5, symbolSize = 0, natLog, score;
!
! // password 1 != password 2
! if ( (password1 != password2) && password2.length > 0)
! return mismatch
!
! //password < 4
! if ( password1.length < 4 )
! return shortPass
!
! //password1 == username
! if ( password1.toLowerCase() == username.toLowerCase() )
! return badPass;
!
! if ( password1.match(/[0-9]/) )
! symbolSize +=10;
! if ( password1.match(/[a-z]/) )
! symbolSize +=26;
! if ( password1.match(/[A-Z]/) )
! symbolSize +=26;
! if ( password1.match(/[^a-zA-Z0-9]/) )
! symbolSize +=31;
!
! natLog = Math.log( Math.pow(symbolSize, password1.length) );
! score = natLog / Math.LN2;
!
! if (score < 40 )
! return badPass
!
! if (score < 56 )
! return goodPass
!
! return strongPass;
! }
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/password-strength-meter.min.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/password-strength-meter.min.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/password-strength-meter.min.js 1969-12-31 17:00:00.000000000 -0700
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/password-strength-meter.min.js 2012-08-22 19:04:18.000000000 -0500
***************
*** 0 ****
--- 1 ----
+ function passwordStrength(f,i,d){var k=1,h=2,b=3,a=4,c=5,g=0,j,e;if((f!=d)&&d.length>0){return c}if(f.length<4){return k}if(f.toLowerCase()==i.toLowerCase()){return h}if(f.match(/[0-9]/)){g+=10}if(f.match(/[a-z]/)){g+=26}if(f.match(/[A-Z]/)){g+=26}if(f.match(/[^a-zA-Z0-9]/)){g+=31}j=Math.log(Math.pow(g,f.length));e=j/Math.LN2;if(e<40){return h}if(e<56){return b}return a};
\ No newline at end of file
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/plugin-install.dev.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/plugin-install.dev.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/plugin-install.dev.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/plugin-install.dev.js 1969-12-31 17:00:00.000000000 -0700
***************
*** 1,53 ****
- /* Plugin Browser Thickbox related JS*/
- var tb_position;
- jQuery(document).ready(function($) {
- tb_position = function() {
- var tbWindow = $('#TB_window'), width = $(window).width(), H = $(window).height(), W = ( 720 < width ) ? 720 : width, adminbar_height = 0;
-
- if ( $('body.admin-bar').length )
- adminbar_height = 28;
-
- if ( tbWindow.size() ) {
- tbWindow.width( W - 50 ).height( H - 45 - adminbar_height );
- $('#TB_iframeContent').width( W - 50 ).height( H - 75 - adminbar_height );
- tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
- if ( typeof document.body.style.maxWidth != 'undefined' )
- tbWindow.css({'top': 20 + adminbar_height + 'px','margin-top':'0'});
- };
-
- return $('a.thickbox').each( function() {
- var href = $(this).attr('href');
- if ( ! href )
- return;
- href = href.replace(/&width=[0-9]+/g, '');
- href = href.replace(/&height=[0-9]+/g, '');
- $(this).attr( 'href', href + '&width=' + ( W - 80 ) + '&height=' + ( H - 85 - adminbar_height ) );
- });
- };
-
- $(window).resize(function(){ tb_position(); });
-
- $('#dashboard_plugins a.thickbox, .plugins a.thickbox').click( function() {
- tb_click.call(this);
-
- $('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
- $('#TB_ajaxWindowTitle').html('
' + plugininstallL10n.plugin_information + ' ' + $(this).attr('title') );
- return false;
- });
-
- /* Plugin install related JS*/
- $('#plugin-information #sidemenu a').click( function() {
- var tab = $(this).attr('name');
- //Flip the tab
- $('#plugin-information-header a.current').removeClass('current');
- $(this).addClass('current');
- //Flip the content.
- $('#section-holder div.section').hide(); //Hide 'em all
- $('#section-' + tab).show();
- return false;
- });
-
- $('a.install-now').click( function() {
- return confirm( plugininstallL10n.ays );
- });
- });
--- 0 ----
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/plugin-install.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/plugin-install.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/plugin-install.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/plugin-install.js 2012-08-22 19:04:18.000000000 -0500
***************
*** 1 ****
! var tb_position;jQuery(document).ready(function(a){tb_position=function(){var f=a("#TB_window"),e=a(window).width(),d=a(window).height(),c=(720
"+plugininstallL10n.plugin_information+" "+a(this).attr("title"));return false});a("#plugin-information #sidemenu a").click(function(){var b=a(this).attr("name");a("#plugin-information-header a.current").removeClass("current");a(this).addClass("current");a("#section-holder div.section").hide();a("#section-"+b).show();return false});a("a.install-now").click(function(){return confirm(plugininstallL10n.ays)})});
\ No newline at end of file
--- 1,53 ----
! /* Plugin Browser Thickbox related JS*/
! var tb_position;
! jQuery(document).ready(function($) {
! tb_position = function() {
! var tbWindow = $('#TB_window'), width = $(window).width(), H = $(window).height(), W = ( 720 < width ) ? 720 : width, adminbar_height = 0;
!
! if ( $('body.admin-bar').length )
! adminbar_height = 28;
!
! if ( tbWindow.size() ) {
! tbWindow.width( W - 50 ).height( H - 45 - adminbar_height );
! $('#TB_iframeContent').width( W - 50 ).height( H - 75 - adminbar_height );
! tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
! if ( typeof document.body.style.maxWidth != 'undefined' )
! tbWindow.css({'top': 20 + adminbar_height + 'px','margin-top':'0'});
! };
!
! return $('a.thickbox').each( function() {
! var href = $(this).attr('href');
! if ( ! href )
! return;
! href = href.replace(/&width=[0-9]+/g, '');
! href = href.replace(/&height=[0-9]+/g, '');
! $(this).attr( 'href', href + '&width=' + ( W - 80 ) + '&height=' + ( H - 85 - adminbar_height ) );
! });
! };
!
! $(window).resize(function(){ tb_position(); });
!
! $('#dashboard_plugins a.thickbox, .plugins a.thickbox').click( function() {
! tb_click.call(this);
!
! $('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
! $('#TB_ajaxWindowTitle').html('' + plugininstallL10n.plugin_information + ' ' + $(this).attr('title') );
! return false;
! });
!
! /* Plugin install related JS*/
! $('#plugin-information #sidemenu a').click( function() {
! var tab = $(this).attr('name');
! //Flip the tab
! $('#plugin-information-header a.current').removeClass('current');
! $(this).addClass('current');
! //Flip the content.
! $('#section-holder div.section').hide(); //Hide 'em all
! $('#section-' + tab).show();
! return false;
! });
!
! $('a.install-now').click( function() {
! return confirm( plugininstallL10n.ays );
! });
! });
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/plugin-install.min.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/plugin-install.min.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/plugin-install.min.js 1969-12-31 17:00:00.000000000 -0700
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/plugin-install.min.js 2012-08-22 19:04:18.000000000 -0500
***************
*** 0 ****
--- 1 ----
+ var tb_position;jQuery(document).ready(function(a){tb_position=function(){var f=a("#TB_window"),e=a(window).width(),d=a(window).height(),c=(720"+plugininstallL10n.plugin_information+" "+a(this).attr("title"));return false});a("#plugin-information #sidemenu a").click(function(){var b=a(this).attr("name");a("#plugin-information-header a.current").removeClass("current");a(this).addClass("current");a("#section-holder div.section").hide();a("#section-"+b).show();return false});a("a.install-now").click(function(){return confirm(plugininstallL10n.ays)})});
\ No newline at end of file
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/postbox.dev.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/postbox.dev.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/postbox.dev.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/postbox.dev.js 1969-12-31 17:00:00.000000000 -0700
***************
*** 1,181 ****
- var postboxes;
-
- (function($) {
- postboxes = {
- add_postbox_toggles : function(page, args) {
- var self = this;
-
- self.init(page, args);
-
- $('.postbox h3, .postbox .handlediv').bind('click.postboxes', function() {
- var p = $(this).parent('.postbox'), id = p.attr('id');
-
- if ( 'dashboard_browser_nag' == id )
- return;
-
- p.toggleClass('closed');
-
- if ( page != 'press-this' )
- self.save_state(page);
-
- if ( id ) {
- if ( !p.hasClass('closed') && $.isFunction(postboxes.pbshow) )
- self.pbshow(id);
- else if ( p.hasClass('closed') && $.isFunction(postboxes.pbhide) )
- self.pbhide(id);
- }
- });
-
- $('.postbox h3 a').click( function(e) {
- e.stopPropagation();
- });
-
- $('.postbox a.dismiss').bind('click.postboxes', function(e) {
- var hide_id = $(this).parents('.postbox').attr('id') + '-hide';
- $( '#' + hide_id ).prop('checked', false).triggerHandler('click');
- return false;
- });
-
- $('.hide-postbox-tog').bind('click.postboxes', function() {
- var box = $(this).val();
-
- if ( $(this).prop('checked') ) {
- $('#' + box).show();
- if ( $.isFunction( postboxes.pbshow ) )
- self.pbshow( box );
- } else {
- $('#' + box).hide();
- if ( $.isFunction( postboxes.pbhide ) )
- self.pbhide( box );
- }
- self.save_state(page);
- self._mark_area();
- });
-
- $('.columns-prefs input[type="radio"]').bind('click.postboxes', function(){
- var n = parseInt($(this).val(), 10);
-
- if ( n ) {
- self._pb_edit(n);
- self.save_order(page);
- }
- });
- },
-
- init : function(page, args) {
- var isMobile = $(document.body).hasClass('mobile');
-
- $.extend( this, args || {} );
- $('#wpbody-content').css('overflow','hidden');
- $('.meta-box-sortables').sortable({
- placeholder: 'sortable-placeholder',
- connectWith: '.meta-box-sortables',
- items: '.postbox',
- handle: '.hndle',
- cursor: 'move',
- delay: ( isMobile ? 200 : 0 ),
- distance: 2,
- tolerance: 'pointer',
- forcePlaceholderSize: true,
- helper: 'clone',
- opacity: 0.65,
- stop: function(e,ui) {
- if ( $(this).find('#dashboard_browser_nag').is(':visible') && 'dashboard_browser_nag' != this.firstChild.id ) {
- $(this).sortable('cancel');
- return;
- }
-
- postboxes.save_order(page);
- },
- receive: function(e,ui) {
- if ( 'dashboard_browser_nag' == ui.item[0].id )
- $(ui.sender).sortable('cancel');
-
- postboxes._mark_area();
- }
- });
-
- if ( isMobile ) {
- $(document.body).bind('orientationchange.postboxes', function(){ postboxes._pb_change(); });
- this._pb_change();
- }
-
- this._mark_area();
- },
-
- save_state : function(page) {
- var closed = $('.postbox').filter('.closed').map(function() { return this.id; }).get().join(','),
- hidden = $('.postbox').filter(':hidden').map(function() { return this.id; }).get().join(',');
-
- $.post(ajaxurl, {
- action: 'closed-postboxes',
- closed: closed,
- hidden: hidden,
- closedpostboxesnonce: jQuery('#closedpostboxesnonce').val(),
- page: page
- });
- },
-
- save_order : function(page) {
- var postVars, page_columns = $('.columns-prefs input:checked').val() || 0;
-
- postVars = {
- action: 'meta-box-order',
- _ajax_nonce: $('#meta-box-order-nonce').val(),
- page_columns: page_columns,
- page: page
- }
- $('.meta-box-sortables').each( function() {
- postVars["order[" + this.id.split('-')[0] + "]"] = $(this).sortable( 'toArray' ).join(',');
- } );
- $.post( ajaxurl, postVars );
- },
-
- _mark_area : function() {
- var visible = $('div.postbox:visible').length, side = $('#post-body #side-sortables');
-
- $('#dashboard-widgets .meta-box-sortables:visible').each(function(n, el){
- var t = $(this);
-
- if ( visible == 1 || t.children('.postbox:visible').length )
- t.removeClass('empty-container');
- else
- t.addClass('empty-container');
- });
-
- if ( side.length ) {
- if ( side.children('.postbox:visible').length )
- side.removeClass('empty-container');
- else if ( $('#postbox-container-1').css('width') == '280px' )
- side.addClass('empty-container');
- }
- },
-
- _pb_edit : function(n) {
- var el = $('.metabox-holder').get(0);
- el.className = el.className.replace(/columns-\d+/, 'columns-' + n);
- },
-
- _pb_change : function() {
- switch ( window.orientation ) {
- case 90:
- case -90:
- this._pb_edit(2);
- break;
- case 0:
- case 180:
- if ( $('#poststuff').length )
- this._pb_edit(1);
- else
- this._pb_edit(2);
- break;
- }
- },
-
- /* Callbacks */
- pbshow : false,
-
- pbhide : false
- };
-
- }(jQuery));
--- 0 ----
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/postbox.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/postbox.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/postbox.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/postbox.js 2012-08-22 19:04:18.000000000 -0500
***************
*** 1 ****
! var postboxes;(function(a){postboxes={add_postbox_toggles:function(d,c){var b=this;b.init(d,c);a(".postbox h3, .postbox .handlediv").bind("click.postboxes",function(){var e=a(this).parent(".postbox"),f=e.attr("id");if("dashboard_browser_nag"==f){return}e.toggleClass("closed");if(d!="press-this"){b.save_state(d)}if(f){if(!e.hasClass("closed")&&a.isFunction(postboxes.pbshow)){b.pbshow(f)}else{if(e.hasClass("closed")&&a.isFunction(postboxes.pbhide)){b.pbhide(f)}}}});a(".postbox h3 a").click(function(f){f.stopPropagation()});a(".postbox a.dismiss").bind("click.postboxes",function(g){var f=a(this).parents(".postbox").attr("id")+"-hide";a("#"+f).prop("checked",false).triggerHandler("click");return false});a(".hide-postbox-tog").bind("click.postboxes",function(){var e=a(this).val();if(a(this).prop("checked")){a("#"+e).show();if(a.isFunction(postboxes.pbshow)){b.pbshow(e)}}else{a("#"+e).hide();if(a.isFunction(postboxes.pbhide)){b.pbhide(e)}}b.save_state(d);b._mark_area()});a('.columns-prefs input[type="radio"]').bind("click.postboxes",function(){var e=parseInt(a(this).val(),10);if(e){b._pb_edit(e);b.save_order(d)}})},init:function(d,c){var b=a(document.body).hasClass("mobile");a.extend(this,c||{});a("#wpbody-content").css("overflow","hidden");a(".meta-box-sortables").sortable({placeholder:"sortable-placeholder",connectWith:".meta-box-sortables",items:".postbox",handle:".hndle",cursor:"move",delay:(b?200:0),distance:2,tolerance:"pointer",forcePlaceholderSize:true,helper:"clone",opacity:0.65,stop:function(g,f){if(a(this).find("#dashboard_browser_nag").is(":visible")&&"dashboard_browser_nag"!=this.firstChild.id){a(this).sortable("cancel");return}postboxes.save_order(d)},receive:function(g,f){if("dashboard_browser_nag"==f.item[0].id){a(f.sender).sortable("cancel")}postboxes._mark_area()}});if(b){a(document.body).bind("orientationchange.postboxes",function(){postboxes._pb_change()});this._pb_change()}this._mark_area()},save_state:function(d){var b=a(".postbox").filter(".closed").map(function(){return this.id}).get().join(","),c=a(".postbox").filter(":hidden").map(function(){return this.id}).get().join(",");a.post(ajaxurl,{action:"closed-postboxes",closed:b,hidden:c,closedpostboxesnonce:jQuery("#closedpostboxesnonce").val(),page:d})},save_order:function(c){var b,d=a(".columns-prefs input:checked").val()||0;b={action:"meta-box-order",_ajax_nonce:a("#meta-box-order-nonce").val(),page_columns:d,page:c};a(".meta-box-sortables").each(function(){b["order["+this.id.split("-")[0]+"]"]=a(this).sortable("toArray").join(",")});a.post(ajaxurl,b)},_mark_area:function(){var c=a("div.postbox:visible").length,b=a("#post-body #side-sortables");a("#dashboard-widgets .meta-box-sortables:visible").each(function(f,e){var d=a(this);if(c==1||d.children(".postbox:visible").length){d.removeClass("empty-container")}else{d.addClass("empty-container")}});if(b.length){if(b.children(".postbox:visible").length){b.removeClass("empty-container")}else{if(a("#postbox-container-1").css("width")=="280px"){b.addClass("empty-container")}}}},_pb_edit:function(c){var b=a(".metabox-holder").get(0);b.className=b.className.replace(/columns-\d+/,"columns-"+c)},_pb_change:function(){switch(window.orientation){case 90:case -90:this._pb_edit(2);break;case 0:case 180:if(a("#poststuff").length){this._pb_edit(1)}else{this._pb_edit(2)}break}},pbshow:false,pbhide:false}}(jQuery));
\ No newline at end of file
--- 1,186 ----
! var postboxes;
!
! (function($) {
! postboxes = {
! add_postbox_toggles : function(page, args) {
! var self = this;
!
! self.init(page, args);
!
! $('.postbox h3, .postbox .handlediv').bind('click.postboxes', function() {
! var p = $(this).parent('.postbox'), id = p.attr('id');
!
! if ( 'dashboard_browser_nag' == id )
! return;
!
! p.toggleClass('closed');
!
! if ( page != 'press-this' )
! self.save_state(page);
!
! if ( id ) {
! if ( !p.hasClass('closed') && $.isFunction(postboxes.pbshow) )
! self.pbshow(id);
! else if ( p.hasClass('closed') && $.isFunction(postboxes.pbhide) )
! self.pbhide(id);
! }
! });
!
! $('.postbox h3 a').click( function(e) {
! e.stopPropagation();
! });
!
! $('.postbox a.dismiss').bind('click.postboxes', function(e) {
! var hide_id = $(this).parents('.postbox').attr('id') + '-hide';
! $( '#' + hide_id ).prop('checked', false).triggerHandler('click');
! return false;
! });
!
! $('.hide-postbox-tog').bind('click.postboxes', function() {
! var box = $(this).val();
!
! if ( $(this).prop('checked') ) {
! $('#' + box).show();
! if ( $.isFunction( postboxes.pbshow ) )
! self.pbshow( box );
! } else {
! $('#' + box).hide();
! if ( $.isFunction( postboxes.pbhide ) )
! self.pbhide( box );
! }
! self.save_state(page);
! self._mark_area();
! });
!
! $('.columns-prefs input[type="radio"]').bind('click.postboxes', function(){
! var n = parseInt($(this).val(), 10);
!
! if ( n ) {
! self._pb_edit(n);
! self.save_order(page);
! }
! });
! },
!
! init : function(page, args) {
! var isMobile = $(document.body).hasClass('mobile');
!
! $.extend( this, args || {} );
! $('#wpbody-content').css('overflow','hidden');
! $('.meta-box-sortables').sortable({
! placeholder: 'sortable-placeholder',
! connectWith: '.meta-box-sortables',
! items: '.postbox',
! handle: '.hndle',
! cursor: 'move',
! delay: ( isMobile ? 200 : 0 ),
! distance: 2,
! tolerance: 'pointer',
! forcePlaceholderSize: true,
! helper: 'clone',
! opacity: 0.65,
! stop: function(e,ui) {
! if ( $(this).find('#dashboard_browser_nag').is(':visible') && 'dashboard_browser_nag' != this.firstChild.id ) {
! $(this).sortable('cancel');
! return;
! }
!
! postboxes.save_order(page);
! },
! receive: function(e,ui) {
! if ( 'dashboard_browser_nag' == ui.item[0].id )
! $(ui.sender).sortable('cancel');
!
! postboxes._mark_area();
! }
! });
!
! if ( isMobile ) {
! $(document.body).bind('orientationchange.postboxes', function(){ postboxes._pb_change(); });
! this._pb_change();
! }
!
! this._mark_area();
! },
!
! save_state : function(page) {
! var closed = $('.postbox').filter('.closed').map(function() { return this.id; }).get().join(','),
! hidden = $('.postbox').filter(':hidden').map(function() { return this.id; }).get().join(',');
!
! $.post(ajaxurl, {
! action: 'closed-postboxes',
! closed: closed,
! hidden: hidden,
! closedpostboxesnonce: jQuery('#closedpostboxesnonce').val(),
! page: page
! });
! },
!
! save_order : function(page) {
! var postVars, page_columns = $('.columns-prefs input:checked').val() || 0;
!
! postVars = {
! action: 'meta-box-order',
! _ajax_nonce: $('#meta-box-order-nonce').val(),
! page_columns: page_columns,
! page: page
! }
! $('.meta-box-sortables').each( function() {
! postVars["order[" + this.id.split('-')[0] + "]"] = $(this).sortable( 'toArray' ).join(',');
! } );
! $.post( ajaxurl, postVars );
! },
!
! _mark_area : function() {
! var visible = $('div.postbox:visible').length, side = $('#post-body #side-sortables');
!
! $('#dashboard-widgets .meta-box-sortables:visible').each(function(n, el){
! var t = $(this);
!
! if ( visible == 1 || t.children('.postbox:visible').length )
! t.removeClass('empty-container');
! else
! t.addClass('empty-container');
! });
!
! if ( side.length ) {
! if ( side.children('.postbox:visible').length )
! side.removeClass('empty-container');
! else if ( $('#postbox-container-1').css('width') == '280px' )
! side.addClass('empty-container');
! }
! },
!
! _pb_edit : function(n) {
! var el = $('.metabox-holder').get(0);
! el.className = el.className.replace(/columns-\d+/, 'columns-' + n);
! },
!
! _pb_change : function() {
! var check = $( 'label.columns-prefs-1 input[type="radio"]' );
!
! switch ( window.orientation ) {
! case 90:
! case -90:
! if ( !check.length || !check.is(':checked') )
! this._pb_edit(2);
! break;
! case 0:
! case 180:
! if ( $('#poststuff').length ) {
! this._pb_edit(1);
! } else {
! if ( !check.length || !check.is(':checked') )
! this._pb_edit(2);
! }
! break;
! }
! },
!
! /* Callbacks */
! pbshow : false,
!
! pbhide : false
! };
!
! }(jQuery));
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/postbox.min.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/postbox.min.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/postbox.min.js 1969-12-31 17:00:00.000000000 -0700
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/postbox.min.js 2012-08-22 19:04:18.000000000 -0500
***************
*** 0 ****
--- 1 ----
+ var postboxes;(function(a){postboxes={add_postbox_toggles:function(d,c){var b=this;b.init(d,c);a(".postbox h3, .postbox .handlediv").bind("click.postboxes",function(){var e=a(this).parent(".postbox"),f=e.attr("id");if("dashboard_browser_nag"==f){return}e.toggleClass("closed");if(d!="press-this"){b.save_state(d)}if(f){if(!e.hasClass("closed")&&a.isFunction(postboxes.pbshow)){b.pbshow(f)}else{if(e.hasClass("closed")&&a.isFunction(postboxes.pbhide)){b.pbhide(f)}}}});a(".postbox h3 a").click(function(f){f.stopPropagation()});a(".postbox a.dismiss").bind("click.postboxes",function(g){var f=a(this).parents(".postbox").attr("id")+"-hide";a("#"+f).prop("checked",false).triggerHandler("click");return false});a(".hide-postbox-tog").bind("click.postboxes",function(){var e=a(this).val();if(a(this).prop("checked")){a("#"+e).show();if(a.isFunction(postboxes.pbshow)){b.pbshow(e)}}else{a("#"+e).hide();if(a.isFunction(postboxes.pbhide)){b.pbhide(e)}}b.save_state(d);b._mark_area()});a('.columns-prefs input[type="radio"]').bind("click.postboxes",function(){var e=parseInt(a(this).val(),10);if(e){b._pb_edit(e);b.save_order(d)}})},init:function(d,c){var b=a(document.body).hasClass("mobile");a.extend(this,c||{});a("#wpbody-content").css("overflow","hidden");a(".meta-box-sortables").sortable({placeholder:"sortable-placeholder",connectWith:".meta-box-sortables",items:".postbox",handle:".hndle",cursor:"move",delay:(b?200:0),distance:2,tolerance:"pointer",forcePlaceholderSize:true,helper:"clone",opacity:0.65,stop:function(g,f){if(a(this).find("#dashboard_browser_nag").is(":visible")&&"dashboard_browser_nag"!=this.firstChild.id){a(this).sortable("cancel");return}postboxes.save_order(d)},receive:function(g,f){if("dashboard_browser_nag"==f.item[0].id){a(f.sender).sortable("cancel")}postboxes._mark_area()}});if(b){a(document.body).bind("orientationchange.postboxes",function(){postboxes._pb_change()});this._pb_change()}this._mark_area()},save_state:function(d){var b=a(".postbox").filter(".closed").map(function(){return this.id}).get().join(","),c=a(".postbox").filter(":hidden").map(function(){return this.id}).get().join(",");a.post(ajaxurl,{action:"closed-postboxes",closed:b,hidden:c,closedpostboxesnonce:jQuery("#closedpostboxesnonce").val(),page:d})},save_order:function(c){var b,d=a(".columns-prefs input:checked").val()||0;b={action:"meta-box-order",_ajax_nonce:a("#meta-box-order-nonce").val(),page_columns:d,page:c};a(".meta-box-sortables").each(function(){b["order["+this.id.split("-")[0]+"]"]=a(this).sortable("toArray").join(",")});a.post(ajaxurl,b)},_mark_area:function(){var c=a("div.postbox:visible").length,b=a("#post-body #side-sortables");a("#dashboard-widgets .meta-box-sortables:visible").each(function(f,e){var d=a(this);if(c==1||d.children(".postbox:visible").length){d.removeClass("empty-container")}else{d.addClass("empty-container")}});if(b.length){if(b.children(".postbox:visible").length){b.removeClass("empty-container")}else{if(a("#postbox-container-1").css("width")=="280px"){b.addClass("empty-container")}}}},_pb_edit:function(c){var b=a(".metabox-holder").get(0);b.className=b.className.replace(/columns-\d+/,"columns-"+c)},_pb_change:function(){var b=a('label.columns-prefs-1 input[type="radio"]');switch(window.orientation){case 90:case -90:if(!b.length||!b.is(":checked")){this._pb_edit(2)}break;case 0:case 180:if(a("#poststuff").length){this._pb_edit(1)}else{if(!b.length||!b.is(":checked")){this._pb_edit(2)}}break}},pbshow:false,pbhide:false}}(jQuery));
\ No newline at end of file
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/post.dev.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/post.dev.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/post.dev.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/post.dev.js 1969-12-31 17:00:00.000000000 -0700
***************
*** 1,663 ****
- var tagBox, commentsBox, editPermalink, makeSlugeditClickable, WPSetThumbnailHTML, WPSetThumbnailID, WPRemoveThumbnail, wptitlehint;
-
- // return an array with any duplicate, whitespace or values removed
- function array_unique_noempty(a) {
- var out = [];
- jQuery.each( a, function(key, val) {
- val = jQuery.trim(val);
- if ( val && jQuery.inArray(val, out) == -1 )
- out.push(val);
- } );
- return out;
- }
-
- (function($){
-
- tagBox = {
- clean : function(tags) {
- var comma = postL10n.comma;
- if ( ',' !== comma )
- tags = tags.replace(new RegExp(comma, 'g'), ',');
- tags = tags.replace(/\s*,\s*/g, ',').replace(/,+/g, ',').replace(/[,\s]+$/, '').replace(/^[,\s]+/, '');
- if ( ',' !== comma )
- tags = tags.replace(/,/g, comma);
- return tags;
- },
-
- parseTags : function(el) {
- var id = el.id, num = id.split('-check-num-')[1], taxbox = $(el).closest('.tagsdiv'),
- thetags = taxbox.find('.the-tags'), comma = postL10n.comma,
- current_tags = thetags.val().split(comma), new_tags = [];
- delete current_tags[num];
-
- $.each( current_tags, function(key, val) {
- val = $.trim(val);
- if ( val ) {
- new_tags.push(val);
- }
- });
-
- thetags.val( this.clean( new_tags.join(comma) ) );
-
- this.quickClicks(taxbox);
- return false;
- },
-
- quickClicks : function(el) {
- var thetags = $('.the-tags', el),
- tagchecklist = $('.tagchecklist', el),
- id = $(el).attr('id'),
- current_tags, disabled;
-
- if ( !thetags.length )
- return;
-
- disabled = thetags.prop('disabled');
-
- current_tags = thetags.val().split(postL10n.comma);
- tagchecklist.empty();
-
- $.each( current_tags, function( key, val ) {
- var span, xbutton;
-
- val = $.trim( val );
-
- if ( ! val )
- return;
-
- // Create a new span, and ensure the text is properly escaped.
- span = $('X ' );
- xbutton.click( function(){ tagBox.parseTags(this); });
- span.prepend(' ').prepend( xbutton );
- }
-
- // Append the span to the tag list.
- tagchecklist.append( span );
- });
- },
-
- flushTags : function(el, a, f) {
- a = a || false;
- var tags = $('.the-tags', el),
- newtag = $('input.newtag', el),
- comma = postL10n.comma,
- newtags, text;
-
- text = a ? $(a).text() : newtag.val();
- tagsval = tags.val();
- newtags = tagsval ? tagsval + comma + text : text;
-
- newtags = this.clean( newtags );
- newtags = array_unique_noempty( newtags.split(comma) ).join(comma);
- tags.val(newtags);
- this.quickClicks(el);
-
- if ( !a )
- newtag.val('');
- if ( 'undefined' == typeof(f) )
- newtag.focus();
-
- return false;
- },
-
- get : function(id) {
- var tax = id.substr(id.indexOf('-')+1);
-
- $.post(ajaxurl, {'action':'get-tagcloud', 'tax':tax}, function(r, stat) {
- if ( 0 == r || 'success' != stat )
- r = wpAjax.broken;
-
- r = $(''+r+'
');
- $('a', r).click(function(){
- tagBox.flushTags( $(this).closest('.inside').children('.tagsdiv'), this);
- return false;
- });
-
- $('#'+id).after(r);
- });
- },
-
- init : function() {
- var t = this, ajaxtag = $('div.ajaxtag');
-
- $('.tagsdiv').each( function() {
- tagBox.quickClicks(this);
- });
-
- $('input.tagadd', ajaxtag).click(function(){
- t.flushTags( $(this).closest('.tagsdiv') );
- });
-
- $('div.taghint', ajaxtag).click(function(){
- $(this).css('visibility', 'hidden').parent().siblings('.newtag').focus();
- });
-
- $('input.newtag', ajaxtag).blur(function() {
- if ( this.value == '' )
- $(this).parent().siblings('.taghint').css('visibility', '');
- }).focus(function(){
- $(this).parent().siblings('.taghint').css('visibility', 'hidden');
- }).keyup(function(e){
- if ( 13 == e.which ) {
- tagBox.flushTags( $(this).closest('.tagsdiv') );
- return false;
- }
- }).keypress(function(e){
- if ( 13 == e.which ) {
- e.preventDefault();
- return false;
- }
- }).each(function(){
- var tax = $(this).closest('div.tagsdiv').attr('id');
- $(this).suggest( ajaxurl + '?action=ajax-tag-search&tax=' + tax, { delay: 500, minchars: 2, multiple: true, multipleSep: postL10n.comma + ' ' } );
- });
-
- // save tags on post save/publish
- $('#post').submit(function(){
- $('div.tagsdiv').each( function() {
- tagBox.flushTags(this, false, 1);
- });
- });
-
- // tag cloud
- $('a.tagcloud-link').click(function(){
- tagBox.get( $(this).attr('id') );
- $(this).unbind().click(function(){
- $(this).siblings('.the-tagcloud').toggle();
- return false;
- });
- return false;
- });
- }
- };
-
- commentsBox = {
- st : 0,
-
- get : function(total, num) {
- var st = this.st, data;
- if ( ! num )
- num = 20;
-
- this.st += num;
- this.total = total;
- $('#commentsdiv img.waiting').show();
-
- data = {
- 'action' : 'get-comments',
- 'mode' : 'single',
- '_ajax_nonce' : $('#add_comment_nonce').val(),
- 'p' : $('#post_ID').val(),
- 'start' : st,
- 'number' : num
- };
-
- $.post(ajaxurl, data,
- function(r) {
- r = wpAjax.parseAjaxResponse(r);
- $('#commentsdiv .widefat').show();
- $('#commentsdiv img.waiting').hide();
-
- if ( 'object' == typeof r && r.responses[0] ) {
- $('#the-comment-list').append( r.responses[0].data );
-
- theList = theExtraList = null;
- $("a[className*=':']").unbind();
-
- if ( commentsBox.st > commentsBox.total )
- $('#show-comments').hide();
- else
- $('#show-comments').show().children('a').html(postL10n.showcomm);
-
- return;
- } else if ( 1 == r ) {
- $('#show-comments').html(postL10n.endcomm);
- return;
- }
-
- $('#the-comment-list').append(''+wpAjax.broken+' ' +
- $('option[value="' + $('#mm').val() + '"]', '#mm').text() + ' ' +
- jj + ', ' +
- aa + ' @ ' +
- hh + ':' +
- mn + ' '
- );
- }
-
- if ( $('input:radio:checked', '#post-visibility-select').val() == 'private' ) {
- $('#publish').val( postL10n.update );
- if ( optPublish.length == 0 ) {
- postStatus.append('' + postL10n.privatelyPublished + ' ');
- } else {
- optPublish.html( postL10n.privatelyPublished );
- }
- $('option[value="publish"]', postStatus).prop('selected', true);
- $('.edit-post-status', '#misc-publishing-actions').hide();
- } else {
- if ( $('#original_post_status').val() == 'future' || $('#original_post_status').val() == 'draft' ) {
- if ( optPublish.length ) {
- optPublish.remove();
- postStatus.val($('#hidden_post_status').val());
- }
- } else {
- optPublish.html( postL10n.published );
- }
- if ( postStatus.is(':hidden') )
- $('.edit-post-status', '#misc-publishing-actions').show();
- }
- $('#post-status-display').html($('option:selected', postStatus).text());
- if ( $('option:selected', postStatus).val() == 'private' || $('option:selected', postStatus).val() == 'publish' ) {
- $('#save-post').hide();
- } else {
- $('#save-post').show();
- if ( $('option:selected', postStatus).val() == 'pending' ) {
- $('#save-post').show().val( postL10n.savePending );
- } else {
- $('#save-post').show().val( postL10n.saveDraft );
- }
- }
- return true;
- }
-
- $('.edit-visibility', '#visibility').click(function () {
- if ($('#post-visibility-select').is(":hidden")) {
- updateVisibility();
- $('#post-visibility-select').slideDown('fast');
- $(this).hide();
- }
- return false;
- });
-
- $('.cancel-post-visibility', '#post-visibility-select').click(function () {
- $('#post-visibility-select').slideUp('fast');
- $('#visibility-radio-' + $('#hidden-post-visibility').val()).prop('checked', true);
- $('#post_password').val($('#hidden_post_password').val());
- $('#sticky').prop('checked', $('#hidden-post-sticky').prop('checked'));
- $('#post-visibility-display').html(visibility);
- $('.edit-visibility', '#visibility').show();
- updateText();
- return false;
- });
-
- $('.save-post-visibility', '#post-visibility-select').click(function () { // crazyhorse - multiple ok cancels
- var pvSelect = $('#post-visibility-select');
-
- pvSelect.slideUp('fast');
- $('.edit-visibility', '#visibility').show();
- updateText();
-
- if ( $('input:radio:checked', pvSelect).val() != 'public' ) {
- $('#sticky').prop('checked', false);
- } // WEAPON LOCKED
-
- if ( true == $('#sticky').prop('checked') ) {
- sticky = 'Sticky';
- } else {
- sticky = '';
- }
-
- $('#post-visibility-display').html( postL10n[$('input:radio:checked', pvSelect).val() + sticky] );
- return false;
- });
-
- $('input:radio', '#post-visibility-select').change(function() {
- updateVisibility();
- });
-
- $('#timestampdiv').siblings('a.edit-timestamp').click(function() {
- if ($('#timestampdiv').is(":hidden")) {
- $('#timestampdiv').slideDown('fast');
- $(this).hide();
- }
- return false;
- });
-
- $('.cancel-timestamp', '#timestampdiv').click(function() {
- $('#timestampdiv').slideUp('fast');
- $('#mm').val($('#hidden_mm').val());
- $('#jj').val($('#hidden_jj').val());
- $('#aa').val($('#hidden_aa').val());
- $('#hh').val($('#hidden_hh').val());
- $('#mn').val($('#hidden_mn').val());
- $('#timestampdiv').siblings('a.edit-timestamp').show();
- updateText();
- return false;
- });
-
- $('.save-timestamp', '#timestampdiv').click(function () { // crazyhorse - multiple ok cancels
- if ( updateText() ) {
- $('#timestampdiv').slideUp('fast');
- $('#timestampdiv').siblings('a.edit-timestamp').show();
- }
- return false;
- });
-
- $('#post-status-select').siblings('a.edit-post-status').click(function() {
- if ($('#post-status-select').is(":hidden")) {
- $('#post-status-select').slideDown('fast');
- $(this).hide();
- }
- return false;
- });
-
- $('.save-post-status', '#post-status-select').click(function() {
- $('#post-status-select').slideUp('fast');
- $('#post-status-select').siblings('a.edit-post-status').show();
- updateText();
- return false;
- });
-
- $('.cancel-post-status', '#post-status-select').click(function() {
- $('#post-status-select').slideUp('fast');
- $('#post_status').val($('#hidden_post_status').val());
- $('#post-status-select').siblings('a.edit-post-status').show();
- updateText();
- return false;
- });
- } // end submitdiv
-
- // permalink
- if ( $('#edit-slug-box').length ) {
- editPermalink = function(post_id) {
- var i, c = 0, e = $('#editable-post-name'), revert_e = e.html(), real_slug = $('#post_name'), revert_slug = real_slug.val(), b = $('#edit-slug-buttons'), revert_b = b.html(), full = $('#editable-post-name-full').html();
-
- $('#view-post-btn').hide();
- b.html(''+postL10n.ok+' '+postL10n.cancel+' ');
- b.children('.save').click(function() {
- var new_slug = e.children('input').val();
- if ( new_slug == $('#editable-post-name-full').text() ) {
- return $('.cancel', '#edit-slug-buttons').click();
- }
- $.post(ajaxurl, {
- action: 'sample-permalink',
- post_id: post_id,
- new_slug: new_slug,
- new_title: $('#title').val(),
- samplepermalinknonce: $('#samplepermalinknonce').val()
- }, function(data) {
- $('#edit-slug-box').html(data);
- b.html(revert_b);
- real_slug.val(new_slug);
- makeSlugeditClickable();
- $('#view-post-btn').show();
- });
- return false;
- });
-
- $('.cancel', '#edit-slug-buttons').click(function() {
- $('#view-post-btn').show();
- e.html(revert_e);
- b.html(revert_b);
- real_slug.val(revert_slug);
- return false;
- });
-
- for ( i = 0; i < full.length; ++i ) {
- if ( '%' == full.charAt(i) )
- c++;
- }
-
- slug_value = ( c > full.length / 4 ) ? '' : full;
- e.html('X ');h.click(function(){tagBox.parseTags(this)});j.prepend(" ").prepend(h)}e.append(j)})},flushTags:function(g,c,h){c=c||false;var d=a(".the-tags",g),j=a("input.newtag",g),b=postL10n.comma,e,i;i=c?a(c).text():j.val();tagsval=d.val();e=tagsval?tagsval+b+i:i;e=this.clean(e);e=array_unique_noempty(e.split(b)).join(b);d.val(e);this.quickClicks(g);if(!c){j.val("")}if("undefined"==typeof(h)){j.focus()}return false},get:function(c){var b=c.substr(c.indexOf("-")+1);a.post(ajaxurl,{action:"get-tagcloud",tax:b},function(e,d){if(0==e||"success"!=d){e=wpAjax.broken}e=a(''+e+"
");a("a",e).click(function(){tagBox.flushTags(a(this).closest(".inside").children(".tagsdiv"),this);return false});a("#"+c).after(e)})},init:function(){var b=this,c=a("div.ajaxtag");a(".tagsdiv").each(function(){tagBox.quickClicks(this)});a("input.tagadd",c).click(function(){b.flushTags(a(this).closest(".tagsdiv"))});a("div.taghint",c).click(function(){a(this).css("visibility","hidden").parent().siblings(".newtag").focus()});a("input.newtag",c).blur(function(){if(this.value==""){a(this).parent().siblings(".taghint").css("visibility","")}}).focus(function(){a(this).parent().siblings(".taghint").css("visibility","hidden")}).keyup(function(d){if(13==d.which){tagBox.flushTags(a(this).closest(".tagsdiv"));return false}}).keypress(function(d){if(13==d.which){d.preventDefault();return false}}).each(function(){var d=a(this).closest("div.tagsdiv").attr("id");a(this).suggest(ajaxurl+"?action=ajax-tag-search&tax="+d,{delay:500,minchars:2,multiple:true,multipleSep:postL10n.comma+" "})});a("#post").submit(function(){a("div.tagsdiv").each(function(){tagBox.flushTags(this,false,1)})});a("a.tagcloud-link").click(function(){tagBox.get(a(this).attr("id"));a(this).unbind().click(function(){a(this).siblings(".the-tagcloud").toggle();return false});return false})}};commentsBox={st:0,get:function(d,c){var b=this.st,e;if(!c){c=20}this.st+=c;this.total=d;a("#commentsdiv img.waiting").show();e={action:"get-comments",mode:"single",_ajax_nonce:a("#add_comment_nonce").val(),p:a("#post_ID").val(),start:b,number:c};a.post(ajaxurl,e,function(f){f=wpAjax.parseAjaxResponse(f);a("#commentsdiv .widefat").show();a("#commentsdiv img.waiting").hide();if("object"==typeof f&&f.responses[0]){a("#the-comment-list").append(f.responses[0].data);theList=theExtraList=null;a("a[className*=':']").unbind();if(commentsBox.st>commentsBox.total){a("#show-comments").hide()}else{a("#show-comments").show().children("a").html(postL10n.showcomm)}return}else{if(1==f){a("#show-comments").html(postL10n.endcomm);return}}a("#the-comment-list").append(''+wpAjax.broken+" "+f('option[value="'+f("#mm").val()+'"]',"#mm").text()+" "+o+", "+i+" @ "+m+":"+l+" ")}if(f("input:radio:checked","#post-visibility-select").val()=="private"){f("#publish").val(postL10n.update);if(k.length==0){r.append(''+postL10n.privatelyPublished+" ")}else{k.html(postL10n.privatelyPublished)}f('option[value="publish"]',r).prop("selected",true);f(".edit-post-status","#misc-publishing-actions").hide()}else{if(f("#original_post_status").val()=="future"||f("#original_post_status").val()=="draft"){if(k.length){k.remove();r.val(f("#hidden_post_status").val())}}else{k.html(postL10n.published)}if(r.is(":hidden")){f(".edit-post-status","#misc-publishing-actions").show()}}f("#post-status-display").html(f("option:selected",r).text());if(f("option:selected",r).val()=="private"||f("option:selected",r).val()=="publish"){f("#save-post").hide()}else{f("#save-post").show();if(f("option:selected",r).val()=="pending"){f("#save-post").show().val(postL10n.savePending)}else{f("#save-post").show().val(postL10n.saveDraft)}}return true}f(".edit-visibility","#visibility").click(function(){if(f("#post-visibility-select").is(":hidden")){d();f("#post-visibility-select").slideDown("fast");f(this).hide()}return false});f(".cancel-post-visibility","#post-visibility-select").click(function(){f("#post-visibility-select").slideUp("fast");f("#visibility-radio-"+f("#hidden-post-visibility").val()).prop("checked",true);f("#post_password").val(f("#hidden_post_password").val());f("#sticky").prop("checked",f("#hidden-post-sticky").prop("checked"));f("#post-visibility-display").html(a);f(".edit-visibility","#visibility").show();c();return false});f(".save-post-visibility","#post-visibility-select").click(function(){var i=f("#post-visibility-select");i.slideUp("fast");f(".edit-visibility","#visibility").show();c();if(f("input:radio:checked",i).val()!="public"){f("#sticky").prop("checked",false)}if(true==f("#sticky").prop("checked")){g="Sticky"}else{g=""}f("#post-visibility-display").html(postL10n[f("input:radio:checked",i).val()+g]);return false});f("input:radio","#post-visibility-select").change(function(){d()});f("#timestampdiv").siblings("a.edit-timestamp").click(function(){if(f("#timestampdiv").is(":hidden")){f("#timestampdiv").slideDown("fast");f(this).hide()}return false});f(".cancel-timestamp","#timestampdiv").click(function(){f("#timestampdiv").slideUp("fast");f("#mm").val(f("#hidden_mm").val());f("#jj").val(f("#hidden_jj").val());f("#aa").val(f("#hidden_aa").val());f("#hh").val(f("#hidden_hh").val());f("#mn").val(f("#hidden_mn").val());f("#timestampdiv").siblings("a.edit-timestamp").show();c();return false});f(".save-timestamp","#timestampdiv").click(function(){if(c()){f("#timestampdiv").slideUp("fast");f("#timestampdiv").siblings("a.edit-timestamp").show()}return false});f("#post-status-select").siblings("a.edit-post-status").click(function(){if(f("#post-status-select").is(":hidden")){f("#post-status-select").slideDown("fast");f(this).hide()}return false});f(".save-post-status","#post-status-select").click(function(){f("#post-status-select").slideUp("fast");f("#post-status-select").siblings("a.edit-post-status").show();c();return false});f(".cancel-post-status","#post-status-select").click(function(){f("#post-status-select").slideUp("fast");f("#post_status").val(f("#hidden_post_status").val());f("#post-status-select").siblings("a.edit-post-status").show();c();return false})}if(f("#edit-slug-box").length){editPermalink=function(j){var k,n=0,m=f("#editable-post-name"),o=m.html(),r=f("#post_name"),s=r.val(),p=f("#edit-slug-buttons"),q=p.html(),l=f("#editable-post-name-full").html();f("#view-post-btn").hide();p.html(''+postL10n.ok+' '+postL10n.cancel+" ");p.children(".save").click(function(){var i=m.children("input").val();if(i==f("#editable-post-name-full").text()){return f(".cancel","#edit-slug-buttons").click()}f.post(ajaxurl,{action:"sample-permalink",post_id:j,new_slug:i,new_title:f("#title").val(),samplepermalinknonce:f("#samplepermalinknonce").val()},function(t){f("#edit-slug-box").html(t);p.html(q);r.val(i);makeSlugeditClickable();f("#view-post-btn").show()});return false});f(".cancel","#edit-slug-buttons").click(function(){f("#view-post-btn").show();m.html(o);p.html(q);r.val(s);return false});for(k=0;kl.length/4)?"":l;m.html('X ' );
! xbutton.click( function(){ tagBox.parseTags(this); });
! span.prepend(' ').prepend( xbutton );
! }
!
! // Append the span to the tag list.
! tagchecklist.append( span );
! });
! },
!
! flushTags : function(el, a, f) {
! a = a || false;
! var tags = $('.the-tags', el),
! newtag = $('input.newtag', el),
! comma = postL10n.comma,
! newtags, text;
!
! text = a ? $(a).text() : newtag.val();
! tagsval = tags.val();
! newtags = tagsval ? tagsval + comma + text : text;
!
! newtags = this.clean( newtags );
! newtags = array_unique_noempty( newtags.split(comma) ).join(comma);
! tags.val(newtags);
! this.quickClicks(el);
!
! if ( !a )
! newtag.val('');
! if ( 'undefined' == typeof(f) )
! newtag.focus();
!
! return false;
! },
!
! get : function(id) {
! var tax = id.substr(id.indexOf('-')+1);
!
! $.post(ajaxurl, {'action':'get-tagcloud', 'tax':tax}, function(r, stat) {
! if ( 0 == r || 'success' != stat )
! r = wpAjax.broken;
!
! r = $(''+r+'
');
! $('a', r).click(function(){
! tagBox.flushTags( $(this).closest('.inside').children('.tagsdiv'), this);
! return false;
! });
!
! $('#'+id).after(r);
! });
! },
!
! init : function() {
! var t = this, ajaxtag = $('div.ajaxtag');
!
! $('.tagsdiv').each( function() {
! tagBox.quickClicks(this);
! });
!
! $('input.tagadd', ajaxtag).click(function(){
! t.flushTags( $(this).closest('.tagsdiv') );
! });
!
! $('div.taghint', ajaxtag).click(function(){
! $(this).css('visibility', 'hidden').parent().siblings('.newtag').focus();
! });
!
! $('input.newtag', ajaxtag).blur(function() {
! if ( this.value == '' )
! $(this).parent().siblings('.taghint').css('visibility', '');
! }).focus(function(){
! $(this).parent().siblings('.taghint').css('visibility', 'hidden');
! }).keyup(function(e){
! if ( 13 == e.which ) {
! tagBox.flushTags( $(this).closest('.tagsdiv') );
! return false;
! }
! }).keypress(function(e){
! if ( 13 == e.which ) {
! e.preventDefault();
! return false;
! }
! }).each(function(){
! var tax = $(this).closest('div.tagsdiv').attr('id');
! $(this).suggest( ajaxurl + '?action=ajax-tag-search&tax=' + tax, { delay: 500, minchars: 2, multiple: true, multipleSep: postL10n.comma + ' ' } );
! });
!
! // save tags on post save/publish
! $('#post').submit(function(){
! $('div.tagsdiv').each( function() {
! tagBox.flushTags(this, false, 1);
! });
! });
!
! // tag cloud
! $('a.tagcloud-link').click(function(){
! if ( ! $('.the-tagcloud').length )
! tagBox.get( $(this).attr('id') );
! $(this).siblings('.the-tagcloud').toggle();
! return false;
! });
! }
! };
!
! commentsBox = {
! st : 0,
!
! get : function(total, num) {
! var st = this.st, data;
! if ( ! num )
! num = 20;
!
! this.st += num;
! this.total = total;
! $('#commentsdiv .spinner').show();
!
! data = {
! 'action' : 'get-comments',
! 'mode' : 'single',
! '_ajax_nonce' : $('#add_comment_nonce').val(),
! 'p' : $('#post_ID').val(),
! 'start' : st,
! 'number' : num
! };
!
! $.post(ajaxurl, data,
! function(r) {
! r = wpAjax.parseAjaxResponse(r);
! $('#commentsdiv .widefat').show();
! $('#commentsdiv .spinner').hide();
!
! if ( 'object' == typeof r && r.responses[0] ) {
! $('#the-comment-list').append( r.responses[0].data );
!
! theList = theExtraList = null;
! $("a[className*=':']").unbind();
!
! if ( commentsBox.st > commentsBox.total )
! $('#show-comments').hide();
! else
! $('#show-comments').show().children('a').html(postL10n.showcomm);
!
! return;
! } else if ( 1 == r ) {
! $('#show-comments').html(postL10n.endcomm);
! return;
! }
!
! $('#the-comment-list').append(''+wpAjax.broken+' ' +
! $('option[value="' + $('#mm').val() + '"]', '#mm').text() + ' ' +
! jj + ', ' +
! aa + ' @ ' +
! hh + ':' +
! mn + ' '
! );
! }
!
! if ( $('input:radio:checked', '#post-visibility-select').val() == 'private' ) {
! $('#publish').val( postL10n.update );
! if ( optPublish.length == 0 ) {
! postStatus.append('' + postL10n.privatelyPublished + ' ');
! } else {
! optPublish.html( postL10n.privatelyPublished );
! }
! $('option[value="publish"]', postStatus).prop('selected', true);
! $('.edit-post-status', '#misc-publishing-actions').hide();
! } else {
! if ( $('#original_post_status').val() == 'future' || $('#original_post_status').val() == 'draft' ) {
! if ( optPublish.length ) {
! optPublish.remove();
! postStatus.val($('#hidden_post_status').val());
! }
! } else {
! optPublish.html( postL10n.published );
! }
! if ( postStatus.is(':hidden') )
! $('.edit-post-status', '#misc-publishing-actions').show();
! }
! $('#post-status-display').html($('option:selected', postStatus).text());
! if ( $('option:selected', postStatus).val() == 'private' || $('option:selected', postStatus).val() == 'publish' ) {
! $('#save-post').hide();
! } else {
! $('#save-post').show();
! if ( $('option:selected', postStatus).val() == 'pending' ) {
! $('#save-post').show().val( postL10n.savePending );
! } else {
! $('#save-post').show().val( postL10n.saveDraft );
! }
! }
! return true;
! }
!
! $('.edit-visibility', '#visibility').click(function () {
! if ($('#post-visibility-select').is(":hidden")) {
! updateVisibility();
! $('#post-visibility-select').slideDown('fast');
! $(this).hide();
! }
! return false;
! });
!
! $('.cancel-post-visibility', '#post-visibility-select').click(function () {
! $('#post-visibility-select').slideUp('fast');
! $('#visibility-radio-' + $('#hidden-post-visibility').val()).prop('checked', true);
! $('#post_password').val($('#hidden_post_password').val());
! $('#sticky').prop('checked', $('#hidden-post-sticky').prop('checked'));
! $('#post-visibility-display').html(visibility);
! $('.edit-visibility', '#visibility').show();
! updateText();
! return false;
! });
!
! $('.save-post-visibility', '#post-visibility-select').click(function () { // crazyhorse - multiple ok cancels
! var pvSelect = $('#post-visibility-select');
!
! pvSelect.slideUp('fast');
! $('.edit-visibility', '#visibility').show();
! updateText();
!
! if ( $('input:radio:checked', pvSelect).val() != 'public' ) {
! $('#sticky').prop('checked', false);
! } // WEAPON LOCKED
!
! if ( true == $('#sticky').prop('checked') ) {
! sticky = 'Sticky';
! } else {
! sticky = '';
! }
!
! $('#post-visibility-display').html( postL10n[$('input:radio:checked', pvSelect).val() + sticky] );
! return false;
! });
!
! $('input:radio', '#post-visibility-select').change(function() {
! updateVisibility();
! });
!
! $('#timestampdiv').siblings('a.edit-timestamp').click(function() {
! if ($('#timestampdiv').is(":hidden")) {
! $('#timestampdiv').slideDown('fast');
! $('#mm').focus();
! $(this).hide();
! }
! return false;
! });
!
! $('.cancel-timestamp', '#timestampdiv').click(function() {
! $('#timestampdiv').slideUp('fast');
! $('#mm').val($('#hidden_mm').val());
! $('#jj').val($('#hidden_jj').val());
! $('#aa').val($('#hidden_aa').val());
! $('#hh').val($('#hidden_hh').val());
! $('#mn').val($('#hidden_mn').val());
! $('#timestampdiv').siblings('a.edit-timestamp').show();
! updateText();
! return false;
! });
!
! $('.save-timestamp', '#timestampdiv').click(function () { // crazyhorse - multiple ok cancels
! if ( updateText() ) {
! $('#timestampdiv').slideUp('fast');
! $('#timestampdiv').siblings('a.edit-timestamp').show();
! }
! return false;
! });
!
! $('#post').on( 'submit', function(e){
! if ( ! updateText() ) {
! e.preventDefault();
! $('#timestampdiv').show();
! $('#publishing-action .spinner').hide();
! $('#publish').prop('disabled', false).removeClass('button-primary-disabled');
! return false;
! }
! });
!
! $('#post-status-select').siblings('a.edit-post-status').click(function() {
! if ($('#post-status-select').is(":hidden")) {
! $('#post-status-select').slideDown('fast');
! $(this).hide();
! }
! return false;
! });
!
! $('.save-post-status', '#post-status-select').click(function() {
! $('#post-status-select').slideUp('fast');
! $('#post-status-select').siblings('a.edit-post-status').show();
! updateText();
! return false;
! });
!
! $('.cancel-post-status', '#post-status-select').click(function() {
! $('#post-status-select').slideUp('fast');
! $('#post_status').val($('#hidden_post_status').val());
! $('#post-status-select').siblings('a.edit-post-status').show();
! updateText();
! return false;
! });
! } // end submitdiv
!
! // permalink
! if ( $('#edit-slug-box').length ) {
! editPermalink = function(post_id) {
! var i, c = 0, e = $('#editable-post-name'), revert_e = e.html(), real_slug = $('#post_name'), revert_slug = real_slug.val(), b = $('#edit-slug-buttons'), revert_b = b.html(), full = $('#editable-post-name-full').html();
!
! $('#view-post-btn').hide();
! b.html(''+postL10n.ok+' '+postL10n.cancel+' ');
! b.children('.save').click(function() {
! var new_slug = e.children('input').val();
! if ( new_slug == $('#editable-post-name-full').text() ) {
! return $('.cancel', '#edit-slug-buttons').click();
! }
! $.post(ajaxurl, {
! action: 'sample-permalink',
! post_id: post_id,
! new_slug: new_slug,
! new_title: $('#title').val(),
! samplepermalinknonce: $('#samplepermalinknonce').val()
! }, function(data) {
! $('#edit-slug-box').html(data);
! b.html(revert_b);
! real_slug.val(new_slug);
! makeSlugeditClickable();
! $('#view-post-btn').show();
! });
! return false;
! });
!
! $('.cancel', '#edit-slug-buttons').click(function() {
! $('#view-post-btn').show();
! e.html(revert_e);
! b.html(revert_b);
! real_slug.val(revert_slug);
! return false;
! });
!
! for ( i = 0; i < full.length; ++i ) {
! if ( '%' == full.charAt(i) )
! c++;
! }
!
! slug_value = ( c > full.length / 4 ) ? '' : full;
! e.html('
');
! $('#wp-content-wrap').append(el);
! el.on('mousedown', function(e) {
! offset = textarea.height() - e.pageY;
! textarea.blur();
! $(document).mousemove(dragging).mouseup(endDrag);
! return false;
! });
! })();
!
! if ( typeof(tinymce) != 'undefined' ) {
! tinymce.onAddEditor.add(function(mce, ed){
! // iOS expands the iframe to full height and the user cannot adjust it.
! if ( ed.id != 'content' || tinymce.isIOS5 )
! return;
!
! // resize TinyMCE to match the textarea height when switching Text -> Visual
! ed.onLoadContent.add( function(ed, o) {
! var ifr_height, height = parseInt( $('#content').css('height'), 10 ),
! tb_height = $('#content_tbl tr.mceFirst').height();
!
! if ( height && !isNaN(height) && tb_height ) {
! ifr_height = (height - tb_height) + 12; // compensate for padding in the textarea
! // sanity check
! if ( ifr_height > 50 && ifr_height < 5000 ) {
! $('#content_tbl').css('height', '' );
! $('#content_ifr').css('height', ifr_height + 'px' );
! }
! }
! });
!
! // resize the textarea to match TinyMCE's height when switching Visual -> Text
! ed.onSaveContent.add( function(ed, o) {
! var height = $('#content_tbl').height();
!
! if ( height && height > 83 && height < 5000 ) {
! height -= 33;
!
! $('#content').css( 'height', height + 'px' );
! }
! });
!
! // save on resizing TinyMCE
! ed.onPostRender.add(function() {
! $('#content_resize').on('mousedown.wp-mce-resize', function(e){
! $(document).on('mouseup.wp-mce-resize', function(e){
! var height = $('#wp-content-editor-container').height();
!
! height -= 33;
! // sanity check
! if ( height > 50 && height < 5000 && height != getUserSetting( 'ed_size' ) )
! setUserSetting( 'ed_size', height );
!
! $(document).off('mouseup.wp-mce-resize');
! });
! });
! });
! });
! }
! });
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/post.min.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/post.min.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/post.min.js 1969-12-31 17:00:00.000000000 -0700
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/post.min.js 2012-12-04 00:58:31.000000000 -0600
***************
*** 0 ****
--- 1 ----
+ var tagBox,commentsBox,editPermalink,makeSlugeditClickable,WPSetThumbnailHTML,WPSetThumbnailID,WPRemoveThumbnail,wptitlehint;function array_unique_noempty(b){var c=[];jQuery.each(b,function(a,d){d=jQuery.trim(d);if(d&&jQuery.inArray(d,c)==-1){c.push(d)}});return c}(function(a){tagBox={clean:function(c){var b=postL10n.comma;if(","!==b){c=c.replace(new RegExp(b,"g"),",")}c=c.replace(/\s*,\s*/g,",").replace(/,+/g,",").replace(/[,\s]+$/,"").replace(/^[,\s]+/,"");if(","!==b){c=c.replace(/,/g,b)}return c},parseTags:function(f){var i=f.id,c=i.split("-check-num-")[1],e=a(f).closest(".tagsdiv"),h=e.find(".the-tags"),b=postL10n.comma,d=h.val().split(b),g=[];delete d[c];a.each(d,function(j,k){k=a.trim(k);if(k){g.push(k)}});h.val(this.clean(g.join(b)));this.quickClicks(e);return false},quickClicks:function(d){var g=a(".the-tags",d),e=a(".tagchecklist",d),f=a(d).attr("id"),b,c;if(!g.length){return}c=g.prop("disabled");b=g.val().split(postL10n.comma);e.empty();a.each(b,function(i,k){var j,h;k=a.trim(k);if(!k){return}j=a("X ');h.click(function(){tagBox.parseTags(this)});j.prepend(" ").prepend(h)}e.append(j)})},flushTags:function(g,c,h){c=c||false;var d=a(".the-tags",g),j=a("input.newtag",g),b=postL10n.comma,e,i;i=c?a(c).text():j.val();tagsval=d.val();e=tagsval?tagsval+b+i:i;e=this.clean(e);e=array_unique_noempty(e.split(b)).join(b);d.val(e);this.quickClicks(g);if(!c){j.val("")}if("undefined"==typeof(h)){j.focus()}return false},get:function(c){var b=c.substr(c.indexOf("-")+1);a.post(ajaxurl,{action:"get-tagcloud",tax:b},function(e,d){if(0==e||"success"!=d){e=wpAjax.broken}e=a(''+e+"
");a("a",e).click(function(){tagBox.flushTags(a(this).closest(".inside").children(".tagsdiv"),this);return false});a("#"+c).after(e)})},init:function(){var b=this,c=a("div.ajaxtag");a(".tagsdiv").each(function(){tagBox.quickClicks(this)});a("input.tagadd",c).click(function(){b.flushTags(a(this).closest(".tagsdiv"))});a("div.taghint",c).click(function(){a(this).css("visibility","hidden").parent().siblings(".newtag").focus()});a("input.newtag",c).blur(function(){if(this.value==""){a(this).parent().siblings(".taghint").css("visibility","")}}).focus(function(){a(this).parent().siblings(".taghint").css("visibility","hidden")}).keyup(function(d){if(13==d.which){tagBox.flushTags(a(this).closest(".tagsdiv"));return false}}).keypress(function(d){if(13==d.which){d.preventDefault();return false}}).each(function(){var d=a(this).closest("div.tagsdiv").attr("id");a(this).suggest(ajaxurl+"?action=ajax-tag-search&tax="+d,{delay:500,minchars:2,multiple:true,multipleSep:postL10n.comma+" "})});a("#post").submit(function(){a("div.tagsdiv").each(function(){tagBox.flushTags(this,false,1)})});a("a.tagcloud-link").click(function(){if(!a(".the-tagcloud").length){tagBox.get(a(this).attr("id"))}a(this).siblings(".the-tagcloud").toggle();return false})}};commentsBox={st:0,get:function(d,c){var b=this.st,e;if(!c){c=20}this.st+=c;this.total=d;a("#commentsdiv .spinner").show();e={action:"get-comments",mode:"single",_ajax_nonce:a("#add_comment_nonce").val(),p:a("#post_ID").val(),start:b,number:c};a.post(ajaxurl,e,function(f){f=wpAjax.parseAjaxResponse(f);a("#commentsdiv .widefat").show();a("#commentsdiv .spinner").hide();if("object"==typeof f&&f.responses[0]){a("#the-comment-list").append(f.responses[0].data);theList=theExtraList=null;a("a[className*=':']").unbind();if(commentsBox.st>commentsBox.total){a("#show-comments").hide()}else{a("#show-comments").show().children("a").html(postL10n.showcomm)}return}else{if(1==f){a("#show-comments").html(postL10n.endcomm);return}}a("#the-comment-list").append(''+wpAjax.broken+" "+f('option[value="'+f("#mm").val()+'"]',"#mm").text()+" "+o+", "+i+" @ "+m+":"+l+" ")}if(f("input:radio:checked","#post-visibility-select").val()=="private"){f("#publish").val(postL10n.update);if(k.length==0){r.append(''+postL10n.privatelyPublished+" ")}else{k.html(postL10n.privatelyPublished)}f('option[value="publish"]',r).prop("selected",true);f(".edit-post-status","#misc-publishing-actions").hide()}else{if(f("#original_post_status").val()=="future"||f("#original_post_status").val()=="draft"){if(k.length){k.remove();r.val(f("#hidden_post_status").val())}}else{k.html(postL10n.published)}if(r.is(":hidden")){f(".edit-post-status","#misc-publishing-actions").show()}}f("#post-status-display").html(f("option:selected",r).text());if(f("option:selected",r).val()=="private"||f("option:selected",r).val()=="publish"){f("#save-post").hide()}else{f("#save-post").show();if(f("option:selected",r).val()=="pending"){f("#save-post").show().val(postL10n.savePending)}else{f("#save-post").show().val(postL10n.saveDraft)}}return true}f(".edit-visibility","#visibility").click(function(){if(f("#post-visibility-select").is(":hidden")){d();f("#post-visibility-select").slideDown("fast");f(this).hide()}return false});f(".cancel-post-visibility","#post-visibility-select").click(function(){f("#post-visibility-select").slideUp("fast");f("#visibility-radio-"+f("#hidden-post-visibility").val()).prop("checked",true);f("#post_password").val(f("#hidden_post_password").val());f("#sticky").prop("checked",f("#hidden-post-sticky").prop("checked"));f("#post-visibility-display").html(a);f(".edit-visibility","#visibility").show();c();return false});f(".save-post-visibility","#post-visibility-select").click(function(){var i=f("#post-visibility-select");i.slideUp("fast");f(".edit-visibility","#visibility").show();c();if(f("input:radio:checked",i).val()!="public"){f("#sticky").prop("checked",false)}if(true==f("#sticky").prop("checked")){g="Sticky"}else{g=""}f("#post-visibility-display").html(postL10n[f("input:radio:checked",i).val()+g]);return false});f("input:radio","#post-visibility-select").change(function(){d()});f("#timestampdiv").siblings("a.edit-timestamp").click(function(){if(f("#timestampdiv").is(":hidden")){f("#timestampdiv").slideDown("fast");f("#mm").focus();f(this).hide()}return false});f(".cancel-timestamp","#timestampdiv").click(function(){f("#timestampdiv").slideUp("fast");f("#mm").val(f("#hidden_mm").val());f("#jj").val(f("#hidden_jj").val());f("#aa").val(f("#hidden_aa").val());f("#hh").val(f("#hidden_hh").val());f("#mn").val(f("#hidden_mn").val());f("#timestampdiv").siblings("a.edit-timestamp").show();c();return false});f(".save-timestamp","#timestampdiv").click(function(){if(c()){f("#timestampdiv").slideUp("fast");f("#timestampdiv").siblings("a.edit-timestamp").show()}return false});f("#post").on("submit",function(i){if(!c()){i.preventDefault();f("#timestampdiv").show();f("#publishing-action .spinner").hide();f("#publish").prop("disabled",false).removeClass("button-primary-disabled");return false}});f("#post-status-select").siblings("a.edit-post-status").click(function(){if(f("#post-status-select").is(":hidden")){f("#post-status-select").slideDown("fast");f(this).hide()}return false});f(".save-post-status","#post-status-select").click(function(){f("#post-status-select").slideUp("fast");f("#post-status-select").siblings("a.edit-post-status").show();c();return false});f(".cancel-post-status","#post-status-select").click(function(){f("#post-status-select").slideUp("fast");f("#post_status").val(f("#hidden_post_status").val());f("#post-status-select").siblings("a.edit-post-status").show();c();return false})}if(f("#edit-slug-box").length){editPermalink=function(j){var k,n=0,m=f("#editable-post-name"),o=m.html(),r=f("#post_name"),s=r.val(),p=f("#edit-slug-buttons"),q=p.html(),l=f("#editable-post-name-full").html();f("#view-post-btn").hide();p.html(''+postL10n.ok+' '+postL10n.cancel+" ");p.children(".save").click(function(){var i=m.children("input").val();if(i==f("#editable-post-name-full").text()){return f(".cancel","#edit-slug-buttons").click()}f.post(ajaxurl,{action:"sample-permalink",post_id:j,new_slug:i,new_title:f("#title").val(),samplepermalinknonce:f("#samplepermalinknonce").val()},function(t){f("#edit-slug-box").html(t);p.html(q);r.val(i);makeSlugeditClickable();f("#view-post-btn").show()});return false});f(".cancel","#edit-slug-buttons").click(function(){f("#view-post-btn").show();m.html(o);p.html(q);r.val(s);return false});for(k=0;kl.length/4)?"":l;m.html('
');f("#wp-content-wrap").append(j);j.on("mousedown",function(n){l=i.height()-n.pageY;i.blur();f(document).mousemove(k).mouseup(m);return false})})();if(typeof(tinymce)!="undefined"){tinymce.onAddEditor.add(function(i,j){if(j.id!="content"||tinymce.isIOS5){return}j.onLoadContent.add(function(l,n){var p,k=parseInt(f("#content").css("height"),10),m=f("#content_tbl tr.mceFirst").height();if(k&&!isNaN(k)&&m){p=(k-m)+12;if(p>50&&p<5000){f("#content_tbl").css("height","");f("#content_ifr").css("height",p+"px")}}});j.onSaveContent.add(function(l,m){var k=f("#content_tbl").height();if(k&&k>83&&k<5000){k-=33;f("#content").css("height",k+"px")}});j.onPostRender.add(function(){f("#content_resize").on("mousedown.wp-mce-resize",function(k){f(document).on("mouseup.wp-mce-resize",function(m){var l=f("#wp-content-editor-container").height();l-=33;if(l>50&&l<5000&&l!=getUserSetting("ed_size")){setUserSetting("ed_size",l)}f(document).off("mouseup.wp-mce-resize")})})})})}});
\ No newline at end of file
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/set-post-thumbnail.dev.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/set-post-thumbnail.dev.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/set-post-thumbnail.dev.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/set-post-thumbnail.dev.js 1969-12-31 17:00:00.000000000 -0700
***************
*** 1,21 ****
- function WPSetAsThumbnail(id, nonce){
- var $link = jQuery('a#wp-post-thumbnail-' + id);
-
- $link.text( setPostThumbnailL10n.saving );
- jQuery.post(ajaxurl, {
- action:"set-post-thumbnail", post_id: post_id, thumbnail_id: id, _ajax_nonce: nonce, cookie: encodeURIComponent(document.cookie)
- }, function(str){
- var win = window.dialogArguments || opener || parent || top;
- $link.text( setPostThumbnailL10n.setThumbnail );
- if ( str == '0' ) {
- alert( setPostThumbnailL10n.error );
- } else {
- jQuery('a.wp-post-thumbnail').show();
- $link.text( setPostThumbnailL10n.done );
- $link.fadeOut( 2000 );
- win.WPSetThumbnailID(id);
- win.WPSetThumbnailHTML(str);
- }
- }
- );
- }
--- 0 ----
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/set-post-thumbnail.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/set-post-thumbnail.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/set-post-thumbnail.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/set-post-thumbnail.js 2012-08-22 19:04:18.000000000 -0500
***************
*** 1 ****
! function WPSetAsThumbnail(c,b){var a=jQuery("a#wp-post-thumbnail-"+c);a.text(setPostThumbnailL10n.saving);jQuery.post(ajaxurl,{action:"set-post-thumbnail",post_id:post_id,thumbnail_id:c,_ajax_nonce:b,cookie:encodeURIComponent(document.cookie)},function(e){var d=window.dialogArguments||opener||parent||top;a.text(setPostThumbnailL10n.setThumbnail);if(e=="0"){alert(setPostThumbnailL10n.error)}else{jQuery("a.wp-post-thumbnail").show();a.text(setPostThumbnailL10n.done);a.fadeOut(2000);d.WPSetThumbnailID(c);d.WPSetThumbnailHTML(e)}})};
\ No newline at end of file
--- 1,21 ----
! function WPSetAsThumbnail(id, nonce){
! var $link = jQuery('a#wp-post-thumbnail-' + id);
!
! $link.text( setPostThumbnailL10n.saving );
! jQuery.post(ajaxurl, {
! action:"set-post-thumbnail", post_id: post_id, thumbnail_id: id, _ajax_nonce: nonce, cookie: encodeURIComponent(document.cookie)
! }, function(str){
! var win = window.dialogArguments || opener || parent || top;
! $link.text( setPostThumbnailL10n.setThumbnail );
! if ( str == '0' ) {
! alert( setPostThumbnailL10n.error );
! } else {
! jQuery('a.wp-post-thumbnail').show();
! $link.text( setPostThumbnailL10n.done );
! $link.fadeOut( 2000 );
! win.WPSetThumbnailID(id);
! win.WPSetThumbnailHTML(str);
! }
! }
! );
! }
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/set-post-thumbnail.min.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/set-post-thumbnail.min.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/set-post-thumbnail.min.js 1969-12-31 17:00:00.000000000 -0700
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/set-post-thumbnail.min.js 2012-08-22 19:04:18.000000000 -0500
***************
*** 0 ****
--- 1 ----
+ function WPSetAsThumbnail(c,b){var a=jQuery("a#wp-post-thumbnail-"+c);a.text(setPostThumbnailL10n.saving);jQuery.post(ajaxurl,{action:"set-post-thumbnail",post_id:post_id,thumbnail_id:c,_ajax_nonce:b,cookie:encodeURIComponent(document.cookie)},function(e){var d=window.dialogArguments||opener||parent||top;a.text(setPostThumbnailL10n.setThumbnail);if(e=="0"){alert(setPostThumbnailL10n.error)}else{jQuery("a.wp-post-thumbnail").show();a.text(setPostThumbnailL10n.done);a.fadeOut(2000);d.WPSetThumbnailID(c);d.WPSetThumbnailHTML(e)}})};
\ No newline at end of file
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/tags.dev.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/tags.dev.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/tags.dev.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/tags.dev.js 1969-12-31 17:00:00.000000000 -0700
***************
*** 1,68 ****
- jQuery(document).ready(function($) {
-
- $('.delete-tag').live('click', function(e){
- var t = $(this), tr = t.parents('tr'), r = true, data;
- if ( 'undefined' != showNotice )
- r = showNotice.warn();
- if ( r ) {
- data = t.attr('href').replace(/[^?]*\?/, '').replace(/action=delete/, 'action=delete-tag');
- $.post(ajaxurl, data, function(r){
- if ( '1' == r ) {
- $('#ajax-response').empty();
- tr.fadeOut('normal', function(){ tr.remove(); });
- // Remove the term from the parent box and tag cloud
- $('select#parent option[value="' + data.match(/tag_ID=(\d+)/)[1] + '"]').remove();
- $('a.tag-link-' + data.match(/tag_ID=(\d+)/)[1]).remove();
- } else if ( '-1' == r ) {
- $('#ajax-response').empty().append('');
- tr.children().css('backgroundColor', '');
- } else {
- $('#ajax-response').empty().append('');
- tr.children().css('backgroundColor', '');
- }
- });
- tr.children().css('backgroundColor', '#f33');
- }
- return false;
- });
-
- $('#submit').click(function(){
- var form = $(this).parents('form');
-
- if ( !validateForm( form ) )
- return false;
-
- $.post(ajaxurl, $('#addtag').serialize(), function(r){
- $('#ajax-response').empty();
- var res = wpAjax.parseAjaxResponse(r, 'ajax-response');
- if ( ! res || res.errors )
- return;
-
- var parent = form.find('select#parent').val();
-
- if ( parent > 0 && $('#tag-' + parent ).length > 0 ) // If the parent exists on this page, insert it below. Else insert it at the top of the list.
- $('.tags #tag-' + parent).after( res.responses[0].supplemental['noparents'] ); // As the parent exists, Insert the version with - - - prefixed
- else
- $('.tags').prepend( res.responses[0].supplemental['parents'] ); // As the parent is not visible, Insert the version with Parent - Child - ThisTerm
-
- $('.tags .no-items').remove();
-
- if ( form.find('select#parent') ) {
- // Parents field exists, Add new term to the list.
- var term = res.responses[1].supplemental;
-
- // Create an indent for the Parent field
- var indent = '';
- for ( var i = 0; i < res.responses[1].position; i++ )
- indent += ' ';
-
- form.find('select#parent option:selected').after('' + indent + term['name'] + ' ');
- }
-
- $('input[type="text"]:visible, textarea:visible', form).val('');
- });
-
- return false;
- });
-
- });
--- 0 ----
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/tags.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/tags.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/tags.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/tags.js 2012-08-22 19:04:18.000000000 -0500
***************
*** 1 ****
! jQuery(document).ready(function(a){a(".delete-tag").live("click",function(g){var b=a(this),f=b.parents("tr"),c=true,d;if("undefined"!=showNotice){c=showNotice.warn()}if(c){d=b.attr("href").replace(/[^?]*\?/,"").replace(/action=delete/,"action=delete-tag");a.post(ajaxurl,d,function(e){if("1"==e){a("#ajax-response").empty();f.fadeOut("normal",function(){f.remove()});a('select#parent option[value="'+d.match(/tag_ID=(\d+)/)[1]+'"]').remove();a("a.tag-link-"+d.match(/tag_ID=(\d+)/)[1]).remove()}else{if("-1"==e){a("#ajax-response").empty().append('");f.children().css("backgroundColor","")}else{a("#ajax-response").empty().append('");f.children().css("backgroundColor","")}}});f.children().css("backgroundColor","#f33")}return false});a("#submit").click(function(){var b=a(this).parents("form");if(!validateForm(b)){return false}a.post(ajaxurl,a("#addtag").serialize(),function(h){a("#ajax-response").empty();var f=wpAjax.parseAjaxResponse(h,"ajax-response");if(!f||f.errors){return}var g=b.find("select#parent").val();if(g>0&&a("#tag-"+g).length>0){a(".tags #tag-"+g).after(f.responses[0].supplemental.noparents)}else{a(".tags").prepend(f.responses[0].supplemental.parents)}a(".tags .no-items").remove();if(b.find("select#parent")){var e=f.responses[1].supplemental;var c="";for(var d=0;d'+c+e.name+"")}a('input[type="text"]:visible, textarea:visible',b).val("")});return false})});
\ No newline at end of file
--- 1,68 ----
! jQuery(document).ready(function($) {
!
! $('.delete-tag').live('click', function(e){
! var t = $(this), tr = t.parents('tr'), r = true, data;
! if ( 'undefined' != showNotice )
! r = showNotice.warn();
! if ( r ) {
! data = t.attr('href').replace(/[^?]*\?/, '').replace(/action=delete/, 'action=delete-tag');
! $.post(ajaxurl, data, function(r){
! if ( '1' == r ) {
! $('#ajax-response').empty();
! tr.fadeOut('normal', function(){ tr.remove(); });
! // Remove the term from the parent box and tag cloud
! $('select#parent option[value="' + data.match(/tag_ID=(\d+)/)[1] + '"]').remove();
! $('a.tag-link-' + data.match(/tag_ID=(\d+)/)[1]).remove();
! } else if ( '-1' == r ) {
! $('#ajax-response').empty().append('');
! tr.children().css('backgroundColor', '');
! } else {
! $('#ajax-response').empty().append('');
! tr.children().css('backgroundColor', '');
! }
! });
! tr.children().css('backgroundColor', '#f33');
! }
! return false;
! });
!
! $('#submit').click(function(){
! var form = $(this).parents('form');
!
! if ( !validateForm( form ) )
! return false;
!
! $.post(ajaxurl, $('#addtag').serialize(), function(r){
! $('#ajax-response').empty();
! var res = wpAjax.parseAjaxResponse(r, 'ajax-response');
! if ( ! res || res.errors )
! return;
!
! var parent = form.find('select#parent').val();
!
! if ( parent > 0 && $('#tag-' + parent ).length > 0 ) // If the parent exists on this page, insert it below. Else insert it at the top of the list.
! $('.tags #tag-' + parent).after( res.responses[0].supplemental['noparents'] ); // As the parent exists, Insert the version with - - - prefixed
! else
! $('.tags').prepend( res.responses[0].supplemental['parents'] ); // As the parent is not visible, Insert the version with Parent - Child - ThisTerm
!
! $('.tags .no-items').remove();
!
! if ( form.find('select#parent') ) {
! // Parents field exists, Add new term to the list.
! var term = res.responses[1].supplemental;
!
! // Create an indent for the Parent field
! var indent = '';
! for ( var i = 0; i < res.responses[1].position; i++ )
! indent += ' ';
!
! form.find('select#parent option:selected').after('' + indent + term['name'] + ' ');
! }
!
! $('input[type="text"]:visible, textarea:visible', form).val('');
! });
!
! return false;
! });
!
! });
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/tags.min.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/tags.min.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/tags.min.js 1969-12-31 17:00:00.000000000 -0700
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/tags.min.js 2012-08-22 19:04:18.000000000 -0500
***************
*** 0 ****
--- 1 ----
+ jQuery(document).ready(function(a){a(".delete-tag").live("click",function(g){var b=a(this),f=b.parents("tr"),c=true,d;if("undefined"!=showNotice){c=showNotice.warn()}if(c){d=b.attr("href").replace(/[^?]*\?/,"").replace(/action=delete/,"action=delete-tag");a.post(ajaxurl,d,function(e){if("1"==e){a("#ajax-response").empty();f.fadeOut("normal",function(){f.remove()});a('select#parent option[value="'+d.match(/tag_ID=(\d+)/)[1]+'"]').remove();a("a.tag-link-"+d.match(/tag_ID=(\d+)/)[1]).remove()}else{if("-1"==e){a("#ajax-response").empty().append('");f.children().css("backgroundColor","")}else{a("#ajax-response").empty().append('");f.children().css("backgroundColor","")}}});f.children().css("backgroundColor","#f33")}return false});a("#submit").click(function(){var b=a(this).parents("form");if(!validateForm(b)){return false}a.post(ajaxurl,a("#addtag").serialize(),function(h){a("#ajax-response").empty();var f=wpAjax.parseAjaxResponse(h,"ajax-response");if(!f||f.errors){return}var g=b.find("select#parent").val();if(g>0&&a("#tag-"+g).length>0){a(".tags #tag-"+g).after(f.responses[0].supplemental.noparents)}else{a(".tags").prepend(f.responses[0].supplemental.parents)}a(".tags .no-items").remove();if(b.find("select#parent")){var e=f.responses[1].supplemental;var c="";for(var d=0;d'+c+e.name+"")}a('input[type="text"]:visible, textarea:visible',b).val("")});return false})});
\ No newline at end of file
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/theme.dev.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/theme.dev.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/theme.dev.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/theme.dev.js 1969-12-31 17:00:00.000000000 -0700
***************
*** 1,254 ****
- /**
- * Theme Browsing
- *
- * Controls visibility of theme details on manage and install themes pages.
- */
- jQuery( function($) {
- $('#availablethemes').on( 'click', '.theme-detail', function (event) {
- var theme = $(this).closest('.available-theme'),
- details = theme.find('.themedetaildiv');
-
- if ( ! details.length ) {
- details = theme.find('.install-theme-info .theme-details');
- details = details.clone().addClass('themedetaildiv').appendTo( theme ).hide();
- }
-
- details.toggle();
- event.preventDefault();
- });
- });
-
- /**
- * Theme Install
- *
- * Displays theme previews on theme install pages.
- */
- jQuery( function($) {
- if( ! window.postMessage )
- return;
-
- var preview = $('#theme-installer'),
- info = preview.find('.install-theme-info'),
- panel = preview.find('.wp-full-overlay-main'),
- body = $( document.body );
-
- preview.on( 'click', '.close-full-overlay', function( event ) {
- preview.fadeOut( 200, function() {
- panel.empty();
- body.removeClass('theme-installer-active full-overlay-active');
- });
- event.preventDefault();
- });
-
- preview.on( 'click', '.collapse-sidebar', function( event ) {
- preview.toggleClass( 'collapsed' ).toggleClass( 'expanded' );
- event.preventDefault();
- });
-
- $('#availablethemes').on( 'click', '.install-theme-preview', function( event ) {
- var src;
-
- info.html( $(this).closest('.installable-theme').find('.install-theme-info').html() );
- src = info.find( '.theme-preview-url' ).val();
- panel.html( '');
- preview.fadeIn( 200, function() {
- body.addClass('theme-installer-active full-overlay-active');
- });
- event.preventDefault();
- });
- });
-
- var ThemeViewer;
-
- (function($){
- ThemeViewer = function( args ) {
-
- function init() {
- $( '#filter-click, #mini-filter-click' ).unbind( 'click' ).click( function() {
- $( '#filter-click' ).toggleClass( 'current' );
- $( '#filter-box' ).slideToggle();
- $( '#current-theme' ).slideToggle( 300 );
- return false;
- });
-
- $( '#filter-box :checkbox' ).unbind( 'click' ).click( function() {
- var count = $( '#filter-box :checked' ).length,
- text = $( '#filter-click' ).text();
-
- if ( text.indexOf( '(' ) != -1 )
- text = text.substr( 0, text.indexOf( '(' ) );
-
- if ( count == 0 )
- $( '#filter-click' ).text( text );
- else
- $( '#filter-click' ).text( text + ' (' + count + ')' );
- });
-
- /* $('#filter-box :submit').unbind( 'click' ).click(function() {
- var features = [];
- $('#filter-box :checked').each(function() {
- features.push($(this).val());
- });
-
- listTable.update_rows({'features': features}, true, function() {
- $( '#filter-click' ).toggleClass( 'current' );
- $( '#filter-box' ).slideToggle();
- $( '#current-theme' ).slideToggle( 300 );
- });
-
- return false;
- }); */
- }
-
- // These are the functions we expose
- var api = {
- init: init
- };
-
- return api;
- }
- })(jQuery);
-
- jQuery( document ).ready( function($) {
- theme_viewer = new ThemeViewer();
- theme_viewer.init();
- });
-
-
- /**
- * Class that provides infinite scroll for Themes admin screens
- *
- * @since 3.4
- *
- * @uses ajaxurl
- * @uses list_args
- * @uses theme_list_args
- * @uses $('#_ajax_fetch_list_nonce').val()
- * */
- var ThemeScroller;
- (function($){
- ThemeScroller = {
- querying: false,
- scrollPollingDelay: 500,
- failedRetryDelay: 4000,
- outListBottomThreshold: 300,
-
- /**
- * Initializer
- *
- * @since 3.4
- * @access private
- */
- init: function() {
- var self = this;
-
- // Get out early if we don't have the required arguments.
- if ( typeof ajaxurl === 'undefined' ||
- typeof list_args === 'undefined' ||
- typeof theme_list_args === 'undefined' ) {
- $('.pagination-links').show();
- return;
- }
-
- // Handle inputs
- this.nonce = $('#_ajax_fetch_list_nonce').val();
- this.nextPage = ( theme_list_args.paged + 1 );
-
- // Cache jQuery selectors
- this.$outList = $('#availablethemes');
- this.$spinner = $('div.tablenav.bottom').children( 'img.ajax-loading' );
- this.$window = $(window);
- this.$document = $(document);
-
- /**
- * If there are more pages to query, then start polling to track
- * when user hits the bottom of the current page
- */
- if ( theme_list_args.total_pages >= this.nextPage )
- this.pollInterval =
- setInterval( function() {
- return self.poll();
- }, this.scrollPollingDelay );
- },
-
- /**
- * Checks to see if user has scrolled to bottom of page.
- * If so, requests another page of content from self.ajax().
- *
- * @since 3.4
- * @access private
- */
- poll: function() {
- var bottom = this.$document.scrollTop() + this.$window.innerHeight();
-
- if ( this.querying ||
- ( bottom < this.$outList.height() - this.outListBottomThreshold ) )
- return;
-
- this.ajax();
- },
-
- /**
- * Applies results passed from this.ajax() to $outList
- *
- * @since 3.4
- * @access private
- *
- * @param results Array with results from this.ajax() query.
- */
- process: function( results ) {
- if ( results === undefined ) {
- clearInterval( this.pollInterval );
- return;
- }
-
- if ( this.nextPage > theme_list_args.total_pages )
- clearInterval( this.pollInterval );
-
- if ( this.nextPage <= ( theme_list_args.total_pages + 1 ) )
- this.$outList.append( results.rows );
- },
-
- /**
- * Queries next page of themes
- *
- * @since 3.4
- * @access private
- */
- ajax: function() {
- var self = this;
-
- this.querying = true;
-
- var query = {
- action: 'fetch-list',
- paged: this.nextPage,
- s: theme_list_args.search,
- tab: theme_list_args.tab,
- type: theme_list_args.type,
- _ajax_fetch_list_nonce: this.nonce,
- 'features[]': theme_list_args.features,
- 'list_args': list_args
- };
-
- this.$spinner.css( 'visibility', 'visible' );
- $.getJSON( ajaxurl, query )
- .done( function( response ) {
- self.nextPage++;
- self.process( response );
- self.$spinner.css( 'visibility', 'hidden' );
- self.querying = false;
- })
- .fail( function() {
- self.$spinner.css( 'visibility', 'hidden' );
- self.querying = false;
- setTimeout( function() { self.ajax(); }, self.failedRetryDelay );
- });
- }
- }
-
- $(document).ready( function($) {
- ThemeScroller.init();
- });
-
- })(jQuery);
--- 0 ----
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/theme.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/theme.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/theme.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/theme.js 2012-09-26 14:57:44.000000000 -0500
***************
*** 1 ****
! jQuery(function(a){a("#availablethemes").on("click",".theme-detail",function(c){var d=a(this).closest(".available-theme"),b=d.find(".themedetaildiv");if(!b.length){b=d.find(".install-theme-info .theme-details");b=b.clone().addClass("themedetaildiv").appendTo(d).hide()}b.toggle();c.preventDefault()})});jQuery(function(c){if(!window.postMessage){return}var e=c("#theme-installer"),d=e.find(".install-theme-info"),b=e.find(".wp-full-overlay-main"),a=c(document.body);e.on("click",".close-full-overlay",function(f){e.fadeOut(200,function(){b.empty();a.removeClass("theme-installer-active full-overlay-active")});f.preventDefault()});e.on("click",".collapse-sidebar",function(f){e.toggleClass("collapsed").toggleClass("expanded");f.preventDefault()});c("#availablethemes").on("click",".install-theme-preview",function(f){var g;d.html(c(this).closest(".installable-theme").find(".install-theme-info").html());g=d.find(".theme-preview-url").val();b.html('');e.fadeIn(200,function(){a.addClass("theme-installer-active full-overlay-active")});f.preventDefault()})});var ThemeViewer;(function(a){ThemeViewer=function(b){function d(){a("#filter-click, #mini-filter-click").unbind("click").click(function(){a("#filter-click").toggleClass("current");a("#filter-box").slideToggle();a("#current-theme").slideToggle(300);return false});a("#filter-box :checkbox").unbind("click").click(function(){var e=a("#filter-box :checked").length,f=a("#filter-click").text();if(f.indexOf("(")!=-1){f=f.substr(0,f.indexOf("("))}if(e==0){a("#filter-click").text(f)}else{a("#filter-click").text(f+" ("+e+")")}})}var c={init:d};return c}})(jQuery);jQuery(document).ready(function(a){theme_viewer=new ThemeViewer();theme_viewer.init()});var ThemeScroller;(function(a){ThemeScroller={querying:false,scrollPollingDelay:500,failedRetryDelay:4000,outListBottomThreshold:300,init:function(){var b=this;if(typeof ajaxurl==="undefined"||typeof list_args==="undefined"||typeof theme_list_args==="undefined"){a(".pagination-links").show();return}this.nonce=a("#_ajax_fetch_list_nonce").val();this.nextPage=(theme_list_args.paged+1);this.$outList=a("#availablethemes");this.$spinner=a("div.tablenav.bottom").children("img.ajax-loading");this.$window=a(window);this.$document=a(document);if(theme_list_args.total_pages>=this.nextPage){this.pollInterval=setInterval(function(){return b.poll()},this.scrollPollingDelay)}},poll:function(){var b=this.$document.scrollTop()+this.$window.innerHeight();if(this.querying||(btheme_list_args.total_pages){clearInterval(this.pollInterval)}if(this.nextPage<=(theme_list_args.total_pages+1)){this.$outList.append(b.rows)}},ajax:function(){var b=this;this.querying=true;var c={action:"fetch-list",paged:this.nextPage,s:theme_list_args.search,tab:theme_list_args.tab,type:theme_list_args.type,_ajax_fetch_list_nonce:this.nonce,"features[]":theme_list_args.features,list_args:list_args};this.$spinner.css("visibility","visible");a.getJSON(ajaxurl,c).done(function(d){b.nextPage++;b.process(d);b.$spinner.css("visibility","hidden");b.querying=false}).fail(function(){b.$spinner.css("visibility","hidden");b.querying=false;setTimeout(function(){b.ajax()},b.failedRetryDelay)})}};a(document).ready(function(b){ThemeScroller.init()})})(jQuery);
\ No newline at end of file
--- 1,254 ----
! /**
! * Theme Browsing
! *
! * Controls visibility of theme details on manage and install themes pages.
! */
! jQuery( function($) {
! $('#availablethemes').on( 'click', '.theme-detail', function (event) {
! var theme = $(this).closest('.available-theme'),
! details = theme.find('.themedetaildiv');
!
! if ( ! details.length ) {
! details = theme.find('.install-theme-info .theme-details');
! details = details.clone().addClass('themedetaildiv').appendTo( theme ).hide();
! }
!
! details.toggle();
! event.preventDefault();
! });
! });
!
! /**
! * Theme Install
! *
! * Displays theme previews on theme install pages.
! */
! jQuery( function($) {
! if( ! window.postMessage )
! return;
!
! var preview = $('#theme-installer'),
! info = preview.find('.install-theme-info'),
! panel = preview.find('.wp-full-overlay-main'),
! body = $( document.body );
!
! preview.on( 'click', '.close-full-overlay', function( event ) {
! preview.fadeOut( 200, function() {
! panel.empty();
! body.removeClass('theme-installer-active full-overlay-active');
! });
! event.preventDefault();
! });
!
! preview.on( 'click', '.collapse-sidebar', function( event ) {
! preview.toggleClass( 'collapsed' ).toggleClass( 'expanded' );
! event.preventDefault();
! });
!
! $('#availablethemes').on( 'click', '.install-theme-preview', function( event ) {
! var src;
!
! info.html( $(this).closest('.installable-theme').find('.install-theme-info').html() );
! src = info.find( '.theme-preview-url' ).val();
! panel.html( '');
! preview.fadeIn( 200, function() {
! body.addClass('theme-installer-active full-overlay-active');
! });
! event.preventDefault();
! });
! });
!
! var ThemeViewer;
!
! (function($){
! ThemeViewer = function( args ) {
!
! function init() {
! $( '#filter-click, #mini-filter-click' ).unbind( 'click' ).click( function() {
! $( '#filter-click' ).toggleClass( 'current' );
! $( '#filter-box' ).slideToggle();
! $( '#current-theme' ).slideToggle( 300 );
! return false;
! });
!
! $( '#filter-box :checkbox' ).unbind( 'click' ).click( function() {
! var count = $( '#filter-box :checked' ).length,
! text = $( '#filter-click' ).text();
!
! if ( text.indexOf( '(' ) != -1 )
! text = text.substr( 0, text.indexOf( '(' ) );
!
! if ( count == 0 )
! $( '#filter-click' ).text( text );
! else
! $( '#filter-click' ).text( text + ' (' + count + ')' );
! });
!
! /* $('#filter-box :submit').unbind( 'click' ).click(function() {
! var features = [];
! $('#filter-box :checked').each(function() {
! features.push($(this).val());
! });
!
! listTable.update_rows({'features': features}, true, function() {
! $( '#filter-click' ).toggleClass( 'current' );
! $( '#filter-box' ).slideToggle();
! $( '#current-theme' ).slideToggle( 300 );
! });
!
! return false;
! }); */
! }
!
! // These are the functions we expose
! var api = {
! init: init
! };
!
! return api;
! }
! })(jQuery);
!
! jQuery( document ).ready( function($) {
! theme_viewer = new ThemeViewer();
! theme_viewer.init();
! });
!
!
! /**
! * Class that provides infinite scroll for Themes admin screens
! *
! * @since 3.4
! *
! * @uses ajaxurl
! * @uses list_args
! * @uses theme_list_args
! * @uses $('#_ajax_fetch_list_nonce').val()
! * */
! var ThemeScroller;
! (function($){
! ThemeScroller = {
! querying: false,
! scrollPollingDelay: 500,
! failedRetryDelay: 4000,
! outListBottomThreshold: 300,
!
! /**
! * Initializer
! *
! * @since 3.4
! * @access private
! */
! init: function() {
! var self = this;
!
! // Get out early if we don't have the required arguments.
! if ( typeof ajaxurl === 'undefined' ||
! typeof list_args === 'undefined' ||
! typeof theme_list_args === 'undefined' ) {
! $('.pagination-links').show();
! return;
! }
!
! // Handle inputs
! this.nonce = $('#_ajax_fetch_list_nonce').val();
! this.nextPage = ( theme_list_args.paged + 1 );
!
! // Cache jQuery selectors
! this.$outList = $('#availablethemes');
! this.$spinner = $('div.tablenav.bottom').children( '.spinner' );
! this.$window = $(window);
! this.$document = $(document);
!
! /**
! * If there are more pages to query, then start polling to track
! * when user hits the bottom of the current page
! */
! if ( theme_list_args.total_pages >= this.nextPage )
! this.pollInterval =
! setInterval( function() {
! return self.poll();
! }, this.scrollPollingDelay );
! },
!
! /**
! * Checks to see if user has scrolled to bottom of page.
! * If so, requests another page of content from self.ajax().
! *
! * @since 3.4
! * @access private
! */
! poll: function() {
! var bottom = this.$document.scrollTop() + this.$window.innerHeight();
!
! if ( this.querying ||
! ( bottom < this.$outList.height() - this.outListBottomThreshold ) )
! return;
!
! this.ajax();
! },
!
! /**
! * Applies results passed from this.ajax() to $outList
! *
! * @since 3.4
! * @access private
! *
! * @param results Array with results from this.ajax() query.
! */
! process: function( results ) {
! if ( results === undefined ) {
! clearInterval( this.pollInterval );
! return;
! }
!
! if ( this.nextPage > theme_list_args.total_pages )
! clearInterval( this.pollInterval );
!
! if ( this.nextPage <= ( theme_list_args.total_pages + 1 ) )
! this.$outList.append( results.rows );
! },
!
! /**
! * Queries next page of themes
! *
! * @since 3.4
! * @access private
! */
! ajax: function() {
! var self = this;
!
! this.querying = true;
!
! var query = {
! action: 'fetch-list',
! paged: this.nextPage,
! s: theme_list_args.search,
! tab: theme_list_args.tab,
! type: theme_list_args.type,
! _ajax_fetch_list_nonce: this.nonce,
! 'features[]': theme_list_args.features,
! 'list_args': list_args
! };
!
! this.$spinner.show();
! $.getJSON( ajaxurl, query )
! .done( function( response ) {
! self.nextPage++;
! self.process( response );
! self.$spinner.hide();
! self.querying = false;
! })
! .fail( function() {
! self.$spinner.hide();
! self.querying = false;
! setTimeout( function() { self.ajax(); }, self.failedRetryDelay );
! });
! }
! }
!
! $(document).ready( function($) {
! ThemeScroller.init();
! });
!
! })(jQuery);
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/theme.min.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/theme.min.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/theme.min.js 1969-12-31 17:00:00.000000000 -0700
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/theme.min.js 2012-09-26 17:58:46.000000000 -0500
***************
*** 0 ****
--- 1 ----
+ jQuery(function(a){a("#availablethemes").on("click",".theme-detail",function(c){var d=a(this).closest(".available-theme"),b=d.find(".themedetaildiv");if(!b.length){b=d.find(".install-theme-info .theme-details");b=b.clone().addClass("themedetaildiv").appendTo(d).hide()}b.toggle();c.preventDefault()})});jQuery(function(c){if(!window.postMessage){return}var e=c("#theme-installer"),d=e.find(".install-theme-info"),b=e.find(".wp-full-overlay-main"),a=c(document.body);e.on("click",".close-full-overlay",function(f){e.fadeOut(200,function(){b.empty();a.removeClass("theme-installer-active full-overlay-active")});f.preventDefault()});e.on("click",".collapse-sidebar",function(f){e.toggleClass("collapsed").toggleClass("expanded");f.preventDefault()});c("#availablethemes").on("click",".install-theme-preview",function(f){var g;d.html(c(this).closest(".installable-theme").find(".install-theme-info").html());g=d.find(".theme-preview-url").val();b.html('');e.fadeIn(200,function(){a.addClass("theme-installer-active full-overlay-active")});f.preventDefault()})});var ThemeViewer;(function(a){ThemeViewer=function(b){function d(){a("#filter-click, #mini-filter-click").unbind("click").click(function(){a("#filter-click").toggleClass("current");a("#filter-box").slideToggle();a("#current-theme").slideToggle(300);return false});a("#filter-box :checkbox").unbind("click").click(function(){var e=a("#filter-box :checked").length,f=a("#filter-click").text();if(f.indexOf("(")!=-1){f=f.substr(0,f.indexOf("("))}if(e==0){a("#filter-click").text(f)}else{a("#filter-click").text(f+" ("+e+")")}})}var c={init:d};return c}})(jQuery);jQuery(document).ready(function(a){theme_viewer=new ThemeViewer();theme_viewer.init()});var ThemeScroller;(function(a){ThemeScroller={querying:false,scrollPollingDelay:500,failedRetryDelay:4000,outListBottomThreshold:300,init:function(){var b=this;if(typeof ajaxurl==="undefined"||typeof list_args==="undefined"||typeof theme_list_args==="undefined"){a(".pagination-links").show();return}this.nonce=a("#_ajax_fetch_list_nonce").val();this.nextPage=(theme_list_args.paged+1);this.$outList=a("#availablethemes");this.$spinner=a("div.tablenav.bottom").children(".spinner");this.$window=a(window);this.$document=a(document);if(theme_list_args.total_pages>=this.nextPage){this.pollInterval=setInterval(function(){return b.poll()},this.scrollPollingDelay)}},poll:function(){var b=this.$document.scrollTop()+this.$window.innerHeight();if(this.querying||(btheme_list_args.total_pages){clearInterval(this.pollInterval)}if(this.nextPage<=(theme_list_args.total_pages+1)){this.$outList.append(b.rows)}},ajax:function(){var b=this;this.querying=true;var c={action:"fetch-list",paged:this.nextPage,s:theme_list_args.search,tab:theme_list_args.tab,type:theme_list_args.type,_ajax_fetch_list_nonce:this.nonce,"features[]":theme_list_args.features,list_args:list_args};this.$spinner.show();a.getJSON(ajaxurl,c).done(function(d){b.nextPage++;b.process(d);b.$spinner.hide();b.querying=false}).fail(function(){b.$spinner.hide();b.querying=false;setTimeout(function(){b.ajax()},b.failedRetryDelay)})}};a(document).ready(function(b){ThemeScroller.init()})})(jQuery);
\ No newline at end of file
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/theme-preview.dev.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/theme-preview.dev.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/theme-preview.dev.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/theme-preview.dev.js 1969-12-31 17:00:00.000000000 -0700
***************
*** 1,56 ****
-
- var thickDims, tbWidth, tbHeight;
- jQuery(document).ready(function($) {
-
- thickDims = function() {
- var tbWindow = $('#TB_window'), H = $(window).height(), W = $(window).width(), w, h;
-
- w = (tbWidth && tbWidth < W - 90) ? tbWidth : W - 90;
- h = (tbHeight && tbHeight < H - 60) ? tbHeight : H - 60;
-
- if ( tbWindow.size() ) {
- tbWindow.width(w).height(h);
- $('#TB_iframeContent').width(w).height(h - 27);
- tbWindow.css({'margin-left': '-' + parseInt((w / 2),10) + 'px'});
- if ( typeof document.body.style.maxWidth != 'undefined' )
- tbWindow.css({'top':'30px','margin-top':'0'});
- }
- };
-
- thickDims();
- $(window).resize( function() { thickDims() } );
-
- $('a.thickbox-preview').click( function() {
- tb_click.call(this);
-
- var alink = $(this).parents('.available-theme').find('.activatelink'), link = '', href = $(this).attr('href'), url, text;
-
- if ( tbWidth = href.match(/&tbWidth=[0-9]+/) )
- tbWidth = parseInt(tbWidth[0].replace(/[^0-9]+/g, ''), 10);
- else
- tbWidth = $(window).width() - 90;
-
- if ( tbHeight = href.match(/&tbHeight=[0-9]+/) )
- tbHeight = parseInt(tbHeight[0].replace(/[^0-9]+/g, ''), 10);
- else
- tbHeight = $(window).height() - 60;
-
- if ( alink.length ) {
- url = alink.attr('href') || '';
- text = alink.attr('title') || '';
- link = ' ' + text + ' ';
- } else {
- text = $(this).attr('title') || '';
- link = ' ' + text + ' ';
- }
-
- $('#TB_title').css({'background-color':'#222','color':'#dfdfdf'});
- $('#TB_closeAjaxWindow').css({'float':'left'});
- $('#TB_ajaxWindowTitle').css({'float':'right'}).html(link);
-
- $('#TB_iframeContent').width('100%');
- thickDims();
-
- return false;
- } );
- });
--- 0 ----
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/theme-preview.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/theme-preview.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/theme-preview.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/theme-preview.js 2012-08-22 19:04:18.000000000 -0500
***************
*** 1 ****
! var thickDims,tbWidth,tbHeight;jQuery(document).ready(function(a){thickDims=function(){var f=a("#TB_window"),d=a(window).height(),b=a(window).width(),c,e;c=(tbWidth&&tbWidth'+f+""}else{f=a(this).attr("title")||"";e=' '+f+" "}a("#TB_title").css({"background-color":"#222",color:"#dfdfdf"});a("#TB_closeAjaxWindow").css({"float":"left"});a("#TB_ajaxWindowTitle").css({"float":"right"}).html(e);a("#TB_iframeContent").width("100%");thickDims();return false})});
\ No newline at end of file
--- 1,56 ----
!
! var thickDims, tbWidth, tbHeight;
! jQuery(document).ready(function($) {
!
! thickDims = function() {
! var tbWindow = $('#TB_window'), H = $(window).height(), W = $(window).width(), w, h;
!
! w = (tbWidth && tbWidth < W - 90) ? tbWidth : W - 90;
! h = (tbHeight && tbHeight < H - 60) ? tbHeight : H - 60;
!
! if ( tbWindow.size() ) {
! tbWindow.width(w).height(h);
! $('#TB_iframeContent').width(w).height(h - 27);
! tbWindow.css({'margin-left': '-' + parseInt((w / 2),10) + 'px'});
! if ( typeof document.body.style.maxWidth != 'undefined' )
! tbWindow.css({'top':'30px','margin-top':'0'});
! }
! };
!
! thickDims();
! $(window).resize( function() { thickDims() } );
!
! $('a.thickbox-preview').click( function() {
! tb_click.call(this);
!
! var alink = $(this).parents('.available-theme').find('.activatelink'), link = '', href = $(this).attr('href'), url, text;
!
! if ( tbWidth = href.match(/&tbWidth=[0-9]+/) )
! tbWidth = parseInt(tbWidth[0].replace(/[^0-9]+/g, ''), 10);
! else
! tbWidth = $(window).width() - 90;
!
! if ( tbHeight = href.match(/&tbHeight=[0-9]+/) )
! tbHeight = parseInt(tbHeight[0].replace(/[^0-9]+/g, ''), 10);
! else
! tbHeight = $(window).height() - 60;
!
! if ( alink.length ) {
! url = alink.attr('href') || '';
! text = alink.attr('title') || '';
! link = ' ' + text + ' ';
! } else {
! text = $(this).attr('title') || '';
! link = ' ' + text + ' ';
! }
!
! $('#TB_title').css({'background-color':'#222','color':'#dfdfdf'});
! $('#TB_closeAjaxWindow').css({'float':'left'});
! $('#TB_ajaxWindowTitle').css({'float':'right'}).html(link);
!
! $('#TB_iframeContent').width('100%');
! thickDims();
!
! return false;
! } );
! });
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/theme-preview.min.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/theme-preview.min.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/theme-preview.min.js 1969-12-31 17:00:00.000000000 -0700
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/theme-preview.min.js 2012-08-22 19:04:18.000000000 -0500
***************
*** 0 ****
--- 1 ----
+ var thickDims,tbWidth,tbHeight;jQuery(document).ready(function(a){thickDims=function(){var f=a("#TB_window"),d=a(window).height(),b=a(window).width(),c,e;c=(tbWidth&&tbWidth'+f+""}else{f=a(this).attr("title")||"";e=' '+f+" "}a("#TB_title").css({"background-color":"#222",color:"#dfdfdf"});a("#TB_closeAjaxWindow").css({"float":"left"});a("#TB_ajaxWindowTitle").css({"float":"right"}).html(e);a("#TB_iframeContent").width("100%");thickDims();return false})});
\ No newline at end of file
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/user-profile.dev.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/user-profile.dev.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/user-profile.dev.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/user-profile.dev.js 1969-12-31 17:00:00.000000000 -0700
***************
*** 1,78 ****
- (function($){
-
- function check_pass_strength() {
- var pass1 = $('#pass1').val(), user = $('#user_login').val(), pass2 = $('#pass2').val(), strength;
-
- $('#pass-strength-result').removeClass('short bad good strong');
- if ( ! pass1 ) {
- $('#pass-strength-result').html( pwsL10n.empty );
- return;
- }
-
- strength = passwordStrength(pass1, user, pass2);
-
- switch ( strength ) {
- case 2:
- $('#pass-strength-result').addClass('bad').html( pwsL10n['bad'] );
- break;
- case 3:
- $('#pass-strength-result').addClass('good').html( pwsL10n['good'] );
- break;
- case 4:
- $('#pass-strength-result').addClass('strong').html( pwsL10n['strong'] );
- break;
- case 5:
- $('#pass-strength-result').addClass('short').html( pwsL10n['mismatch'] );
- break;
- default:
- $('#pass-strength-result').addClass('short').html( pwsL10n['short'] );
- }
- }
-
- $(document).ready( function() {
- var select = $('#display_name');
-
- $('#pass1').val('').keyup( check_pass_strength );
- $('#pass2').val('').keyup( check_pass_strength );
- $('#pass-strength-result').show();
- $('.color-palette').click( function() {
- $(this).siblings('input[name="admin_color"]').prop('checked', true);
- });
-
- if ( select.length ) {
- $('#first_name, #last_name, #nickname').bind( 'blur.user_profile', function() {
- var dub = [],
- inputs = {
- display_nickname : $('#nickname').val() || '',
- display_username : $('#user_login').val() || '',
- display_firstname : $('#first_name').val() || '',
- display_lastname : $('#last_name').val() || ''
- };
-
- if ( inputs.display_firstname && inputs.display_lastname ) {
- inputs['display_firstlast'] = inputs.display_firstname + ' ' + inputs.display_lastname;
- inputs['display_lastfirst'] = inputs.display_lastname + ' ' + inputs.display_firstname;
- }
-
- $.each( $('option', select), function( i, el ){
- dub.push( el.value );
- });
-
- $.each(inputs, function( id, value ) {
- if ( ! value )
- return;
-
- var val = value.replace(/<\/?[a-z][^>]*>/gi, '');
-
- if ( inputs[id].length && $.inArray( val, dub ) == -1 ) {
- dub.push(val);
- $(' 250 && inside.closest('div.widgets-sortables').length ) {
- css['width'] = w + 30 + 'px';
- if ( inside.closest('div.widget-liquid-right').length )
- css[margin] = 235 - w + 'px';
- widget.css(css);
- }
- wpWidgets.fixLabels(widget);
- inside.slideDown('fast');
- } else {
- inside.slideUp('fast', function() {
- widget.css({'width':'', margin:''});
- });
- }
- return false;
- });
-
- $('input.widget-control-save').live('click', function(){
- wpWidgets.save( $(this).closest('div.widget'), 0, 1, 0 );
- return false;
- });
-
- $('a.widget-control-remove').live('click', function(){
- wpWidgets.save( $(this).closest('div.widget'), 1, 1, 0 );
- return false;
- });
-
- $('a.widget-control-close').live('click', function(){
- wpWidgets.close( $(this).closest('div.widget') );
- return false;
- });
-
- sidebars.children('.widget').each(function() {
- wpWidgets.appendTitle(this);
- if ( $('p.widget-error', this).length )
- $('a.widget-action', this).click();
- });
-
- $('#widget-list').children('.widget').draggable({
- connectToSortable: 'div.widgets-sortables',
- handle: '> .widget-top > .widget-title',
- distance: 2,
- helper: 'clone',
- zIndex: 5,
- containment: 'document',
- start: function(e,ui) {
- ui.helper.find('div.widget-description').hide();
- the_id = this.id;
- },
- stop: function(e,ui) {
- if ( rem )
- $(rem).hide();
-
- rem = '';
- }
- });
-
- sidebars.sortable({
- placeholder: 'widget-placeholder',
- items: '> .widget',
- handle: '> .widget-top > .widget-title',
- cursor: 'move',
- distance: 2,
- containment: 'document',
- start: function(e,ui) {
- ui.item.children('.widget-inside').hide();
- ui.item.css({margin:'', 'width':''});
- },
- stop: function(e,ui) {
- if ( ui.item.hasClass('ui-draggable') && ui.item.data('draggable') )
- ui.item.draggable('destroy');
-
- if ( ui.item.hasClass('deleting') ) {
- wpWidgets.save( ui.item, 1, 0, 1 ); // delete widget
- ui.item.remove();
- return;
- }
-
- var add = ui.item.find('input.add_new').val(),
- n = ui.item.find('input.multi_number').val(),
- id = the_id,
- sb = $(this).attr('id');
-
- ui.item.css({margin:'', 'width':''});
- the_id = '';
-
- if ( add ) {
- if ( 'multi' == add ) {
- ui.item.html( ui.item.html().replace(/<[^<>]+>/g, function(m){ return m.replace(/__i__|%i%/g, n); }) );
- ui.item.attr( 'id', id.replace('__i__', n) );
- n++;
- $('div#' + id).find('input.multi_number').val(n);
- } else if ( 'single' == add ) {
- ui.item.attr( 'id', 'new-' + id );
- rem = 'div#' + id;
- }
- wpWidgets.save( ui.item, 0, 0, 1 );
- ui.item.find('input.add_new').val('');
- ui.item.find('a.widget-action').click();
- return;
- }
- wpWidgets.saveOrder(sb);
- },
- receive: function(e, ui) {
- var sender = $(ui.sender);
-
- if ( !$(this).is(':visible') || this.id.indexOf('orphaned_widgets') != -1 )
- sender.sortable('cancel');
-
- if ( sender.attr('id').indexOf('orphaned_widgets') != -1 && !sender.children('.widget').length ) {
- sender.parents('.orphan-sidebar').slideUp(400, function(){ $(this).remove(); });
- }
- }
- }).sortable('option', 'connectWith', 'div.widgets-sortables').parent().filter('.closed').children('.widgets-sortables').sortable('disable');
-
- $('#available-widgets').droppable({
- tolerance: 'pointer',
- accept: function(o){
- return $(o).parent().attr('id') != 'widget-list';
- },
- drop: function(e,ui) {
- ui.draggable.addClass('deleting');
- $('#removing-widget').hide().children('span').html('');
- },
- over: function(e,ui) {
- ui.draggable.addClass('deleting');
- $('div.widget-placeholder').hide();
-
- if ( ui.draggable.hasClass('ui-sortable-helper') )
- $('#removing-widget').show().children('span')
- .html( ui.draggable.find('div.widget-title').children('h4').html() );
- },
- out: function(e,ui) {
- ui.draggable.removeClass('deleting');
- $('div.widget-placeholder').show();
- $('#removing-widget').hide().children('span').html('');
- }
- });
- },
-
- saveOrder : function(sb) {
- if ( sb )
- $('#' + sb).closest('div.widgets-holder-wrap').find('img.ajax-feedback').css('visibility', 'visible');
-
- var a = {
- action: 'widgets-order',
- savewidgets: $('#_wpnonce_widgets').val(),
- sidebars: []
- };
-
- $('div.widgets-sortables').each( function() {
- if ( $(this).sortable )
- a['sidebars[' + $(this).attr('id') + ']'] = $(this).sortable('toArray').join(',');
- });
-
- $.post( ajaxurl, a, function() {
- $('img.ajax-feedback').css('visibility', 'hidden');
- });
-
- this.resize();
- },
-
- save : function(widget, del, animate, order) {
- var sb = widget.closest('div.widgets-sortables').attr('id'), data = widget.find('form').serialize(), a;
- widget = $(widget);
- $('.ajax-feedback', widget).css('visibility', 'visible');
-
- a = {
- action: 'save-widget',
- savewidgets: $('#_wpnonce_widgets').val(),
- sidebar: sb
- };
-
- if ( del )
- a['delete_widget'] = 1;
-
- data += '&' + $.param(a);
-
- $.post( ajaxurl, data, function(r){
- var id;
-
- if ( del ) {
- if ( !$('input.widget_number', widget).val() ) {
- id = $('input.widget-id', widget).val();
- $('#available-widgets').find('input.widget-id').each(function(){
- if ( $(this).val() == id )
- $(this).closest('div.widget').show();
- });
- }
-
- if ( animate ) {
- order = 0;
- widget.slideUp('fast', function(){
- $(this).remove();
- wpWidgets.saveOrder();
- });
- } else {
- widget.remove();
- wpWidgets.resize();
- }
- } else {
- $('.ajax-feedback').css('visibility', 'hidden');
- if ( r && r.length > 2 ) {
- $('div.widget-content', widget).html(r);
- wpWidgets.appendTitle(widget);
- wpWidgets.fixLabels(widget);
- }
- }
- if ( order )
- wpWidgets.saveOrder();
- });
- },
-
- appendTitle : function(widget) {
- var title = $('input[id*="-title"]', widget).val() || '';
-
- if ( title )
- title = ': ' + title.replace(/<[^<>]+>/g, '').replace(//g, '>');
-
- $(widget).children('.widget-top').children('.widget-title').children()
- .children('.in-widget-title').html(title);
-
- },
-
- resize : function() {
- $('div.widgets-sortables').each(function(){
- if ( $(this).parent().hasClass('inactive') )
- return true;
-
- var h = 50, H = $(this).children('.widget').length;
- h = h + parseInt(H * 48, 10);
- $(this).css( 'minHeight', h + 'px' );
- });
- },
-
- fixLabels : function(widget) {
- widget.children('.widget-inside').find('label').each(function(){
- var f = $(this).attr('for');
- if ( f && f == $('input', this).attr('id') )
- $(this).removeAttr('for');
- });
- },
-
- close : function(widget) {
- widget.children('.widget-inside').slideUp('fast', function(){
- widget.css({'width':'', margin:''});
- });
- }
- };
-
- $(document).ready(function($){ wpWidgets.init(); });
-
- })(jQuery);
--- 0 ----
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/widgets.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/widgets.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/widgets.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/widgets.js 2012-11-06 16:36:24.000000000 -0600
***************
*** 1 ****
! var wpWidgets;(function(a){wpWidgets={init:function(){var f,d=a("div.widgets-sortables"),c=!!("undefined"!=typeof isRtl&&isRtl),e=(isRtl?"marginRight":"marginLeft"),b;a("#widgets-right").children(".widgets-holder-wrap").children(".sidebar-name").click(function(){var h=a(this).siblings(".widgets-sortables"),g=a(this).parent();if(!g.hasClass("closed")){h.sortable("disable");g.addClass("closed")}else{g.removeClass("closed");h.sortable("enable").sortable("refresh")}});a("#widgets-left").children(".widgets-holder-wrap").children(".sidebar-name").click(function(){a(this).parent().toggleClass("closed")});d.each(function(){if(a(this).parent().hasClass("inactive")){return true}var i=50,g=a(this).children(".widget").length;i=i+parseInt(g*48,10);a(this).css("minHeight",i+"px")});a("a.widget-action").live("click",function(){var i={},j=a(this).closest("div.widget"),g=j.children(".widget-inside"),h=parseInt(j.find("input.widget-width").val(),10);if(g.is(":hidden")){if(h>250&&g.closest("div.widgets-sortables").length){i.width=h+30+"px";if(g.closest("div.widget-liquid-right").length){i[e]=235-h+"px"}j.css(i)}wpWidgets.fixLabels(j);g.slideDown("fast")}else{g.slideUp("fast",function(){j.css({width:"",margin:""})})}return false});a("input.widget-control-save").live("click",function(){wpWidgets.save(a(this).closest("div.widget"),0,1,0);return false});a("a.widget-control-remove").live("click",function(){wpWidgets.save(a(this).closest("div.widget"),1,1,0);return false});a("a.widget-control-close").live("click",function(){wpWidgets.close(a(this).closest("div.widget"));return false});d.children(".widget").each(function(){wpWidgets.appendTitle(this);if(a("p.widget-error",this).length){a("a.widget-action",this).click()}});a("#widget-list").children(".widget").draggable({connectToSortable:"div.widgets-sortables",handle:"> .widget-top > .widget-title",distance:2,helper:"clone",zIndex:5,containment:"document",start:function(h,g){g.helper.find("div.widget-description").hide();b=this.id},stop:function(h,g){if(f){a(f).hide()}f=""}});d.sortable({placeholder:"widget-placeholder",items:"> .widget",handle:"> .widget-top > .widget-title",cursor:"move",distance:2,containment:"document",start:function(h,g){g.item.children(".widget-inside").hide();g.item.css({margin:"",width:""})},stop:function(i,g){if(g.item.hasClass("ui-draggable")&&g.item.data("draggable")){g.item.draggable("destroy")}if(g.item.hasClass("deleting")){wpWidgets.save(g.item,1,0,1);g.item.remove();return}var h=g.item.find("input.add_new").val(),l=g.item.find("input.multi_number").val(),k=b,j=a(this).attr("id");g.item.css({margin:"",width:""});b="";if(h){if("multi"==h){g.item.html(g.item.html().replace(/<[^<>]+>/g,function(n){return n.replace(/__i__|%i%/g,l)}));g.item.attr("id",k.replace("__i__",l));l++;a("div#"+k).find("input.multi_number").val(l)}else{if("single"==h){g.item.attr("id","new-"+k);f="div#"+k}}wpWidgets.save(g.item,0,0,1);g.item.find("input.add_new").val("");g.item.find("a.widget-action").click();return}wpWidgets.saveOrder(j)},receive:function(i,h){var g=a(h.sender);if(!a(this).is(":visible")||this.id.indexOf("orphaned_widgets")!=-1){g.sortable("cancel")}if(g.attr("id").indexOf("orphaned_widgets")!=-1&&!g.children(".widget").length){g.parents(".orphan-sidebar").slideUp(400,function(){a(this).remove()})}}}).sortable("option","connectWith","div.widgets-sortables").parent().filter(".closed").children(".widgets-sortables").sortable("disable");a("#available-widgets").droppable({tolerance:"pointer",accept:function(g){return a(g).parent().attr("id")!="widget-list"},drop:function(h,g){g.draggable.addClass("deleting");a("#removing-widget").hide().children("span").html("")},over:function(h,g){g.draggable.addClass("deleting");a("div.widget-placeholder").hide();if(g.draggable.hasClass("ui-sortable-helper")){a("#removing-widget").show().children("span").html(g.draggable.find("div.widget-title").children("h4").html())}},out:function(h,g){g.draggable.removeClass("deleting");a("div.widget-placeholder").show();a("#removing-widget").hide().children("span").html("")}})},saveOrder:function(c){if(c){a("#"+c).closest("div.widgets-holder-wrap").find("img.ajax-feedback").css("visibility","visible")}var b={action:"widgets-order",savewidgets:a("#_wpnonce_widgets").val(),sidebars:[]};a("div.widgets-sortables").each(function(){if(a(this).sortable){b["sidebars["+a(this).attr("id")+"]"]=a(this).sortable("toArray").join(",")}});a.post(ajaxurl,b,function(){a("img.ajax-feedback").css("visibility","hidden")});this.resize()},save:function(g,d,e,b){var h=g.closest("div.widgets-sortables").attr("id"),f=g.find("form").serialize(),c;g=a(g);a(".ajax-feedback",g).css("visibility","visible");c={action:"save-widget",savewidgets:a("#_wpnonce_widgets").val(),sidebar:h};if(d){c.delete_widget=1}f+="&"+a.param(c);a.post(ajaxurl,f,function(i){var j;if(d){if(!a("input.widget_number",g).val()){j=a("input.widget-id",g).val();a("#available-widgets").find("input.widget-id").each(function(){if(a(this).val()==j){a(this).closest("div.widget").show()}})}if(e){b=0;g.slideUp("fast",function(){a(this).remove();wpWidgets.saveOrder()})}else{g.remove();wpWidgets.resize()}}else{a(".ajax-feedback").css("visibility","hidden");if(i&&i.length>2){a("div.widget-content",g).html(i);wpWidgets.appendTitle(g);wpWidgets.fixLabels(g)}}if(b){wpWidgets.saveOrder()}})},appendTitle:function(b){var c=a('input[id*="-title"]',b).val()||"";if(c){c=": "+c.replace(/<[^<>]+>/g,"").replace(//g,">")}a(b).children(".widget-top").children(".widget-title").children().children(".in-widget-title").html(c)},resize:function(){a("div.widgets-sortables").each(function(){if(a(this).parent().hasClass("inactive")){return true}var c=50,b=a(this).children(".widget").length;c=c+parseInt(b*48,10);a(this).css("minHeight",c+"px")})},fixLabels:function(b){b.children(".widget-inside").find("label").each(function(){var c=a(this).attr("for");if(c&&c==a("input",this).attr("id")){a(this).removeAttr("for")}})},close:function(b){b.children(".widget-inside").slideUp("fast",function(){b.css({width:"",margin:""})})}};a(document).ready(function(b){wpWidgets.init()})})(jQuery);
\ No newline at end of file
--- 1,289 ----
! var wpWidgets;
! (function($) {
!
! wpWidgets = {
!
! init : function() {
! var rem, sidebars = $('div.widgets-sortables'), isRTL = !! ( 'undefined' != typeof isRtl && isRtl ),
! margin = ( isRtl ? 'marginRight' : 'marginLeft' ), the_id;
!
! $('#widgets-right').children('.widgets-holder-wrap').children('.sidebar-name').click(function(){
! var c = $(this).siblings('.widgets-sortables'), p = $(this).parent();
! if ( !p.hasClass('closed') ) {
! c.sortable('disable');
! p.addClass('closed');
! } else {
! p.removeClass('closed');
! c.sortable('enable').sortable('refresh');
! }
! });
!
! $('#widgets-left').children('.widgets-holder-wrap').children('.sidebar-name').click(function() {
! $(this).parent().toggleClass('closed');
! });
!
! sidebars.each(function(){
! if ( $(this).parent().hasClass('inactive') )
! return true;
!
! var h = 50, H = $(this).children('.widget').length;
! h = h + parseInt(H * 48, 10);
! $(this).css( 'minHeight', h + 'px' );
! });
!
! $(document.body).bind('click.widgets-toggle', function(e){
! var target = $(e.target), css = {}, widget, inside, w;
!
! if ( target.parents('.widget-top').length && ! target.parents('#available-widgets').length ) {
! widget = target.closest('div.widget');
! inside = widget.children('.widget-inside');
! w = parseInt( widget.find('input.widget-width').val(), 10 );
!
! if ( inside.is(':hidden') ) {
! if ( w > 250 && inside.closest('div.widgets-sortables').length ) {
! css['width'] = w + 30 + 'px';
! if ( inside.closest('div.widget-liquid-right').length )
! css[margin] = 235 - w + 'px';
! widget.css(css);
! }
! wpWidgets.fixLabels(widget);
! inside.slideDown('fast');
! } else {
! inside.slideUp('fast', function() {
! widget.css({'width':'', margin:''});
! });
! }
! e.preventDefault();
! } else if ( target.hasClass('widget-control-save') ) {
! wpWidgets.save( target.closest('div.widget'), 0, 1, 0 );
! e.preventDefault();
! } else if ( target.hasClass('widget-control-remove') ) {
! wpWidgets.save( target.closest('div.widget'), 1, 1, 0 );
! e.preventDefault();
! } else if ( target.hasClass('widget-control-close') ) {
! wpWidgets.close( target.closest('div.widget') );
! e.preventDefault();
! }
! });
!
! sidebars.children('.widget').each(function() {
! wpWidgets.appendTitle(this);
! if ( $('p.widget-error', this).length )
! $('a.widget-action', this).click();
! });
!
! $('#widget-list').children('.widget').draggable({
! connectToSortable: 'div.widgets-sortables',
! handle: '> .widget-top > .widget-title',
! distance: 2,
! helper: 'clone',
! zIndex: 100,
! containment: 'document',
! start: function(e,ui) {
! ui.helper.find('div.widget-description').hide();
! the_id = this.id;
! },
! stop: function(e,ui) {
! if ( rem )
! $(rem).hide();
!
! rem = '';
! }
! });
!
! sidebars.sortable({
! placeholder: 'widget-placeholder',
! items: '> .widget',
! handle: '> .widget-top > .widget-title',
! cursor: 'move',
! distance: 2,
! containment: 'document',
! start: function(e,ui) {
! ui.item.children('.widget-inside').hide();
! ui.item.css({margin:'', 'width':''});
! },
! stop: function(e,ui) {
! if ( ui.item.hasClass('ui-draggable') && ui.item.data('draggable') )
! ui.item.draggable('destroy');
!
! if ( ui.item.hasClass('deleting') ) {
! wpWidgets.save( ui.item, 1, 0, 1 ); // delete widget
! ui.item.remove();
! return;
! }
!
! var add = ui.item.find('input.add_new').val(),
! n = ui.item.find('input.multi_number').val(),
! id = the_id,
! sb = $(this).attr('id');
!
! ui.item.css({margin:'', 'width':''});
! the_id = '';
!
! if ( add ) {
! if ( 'multi' == add ) {
! ui.item.html( ui.item.html().replace(/<[^<>]+>/g, function(m){ return m.replace(/__i__|%i%/g, n); }) );
! ui.item.attr( 'id', id.replace('__i__', n) );
! n++;
! $('div#' + id).find('input.multi_number').val(n);
! } else if ( 'single' == add ) {
! ui.item.attr( 'id', 'new-' + id );
! rem = 'div#' + id;
! }
! wpWidgets.save( ui.item, 0, 0, 1 );
! ui.item.find('input.add_new').val('');
! ui.item.find('a.widget-action').click();
! return;
! }
! wpWidgets.saveOrder(sb);
! },
! receive: function(e, ui) {
! var sender = $(ui.sender);
!
! if ( !$(this).is(':visible') || this.id.indexOf('orphaned_widgets') != -1 )
! sender.sortable('cancel');
!
! if ( sender.attr('id').indexOf('orphaned_widgets') != -1 && !sender.children('.widget').length ) {
! sender.parents('.orphan-sidebar').slideUp(400, function(){ $(this).remove(); });
! }
! }
! }).sortable('option', 'connectWith', 'div.widgets-sortables').parent().filter('.closed').children('.widgets-sortables').sortable('disable');
!
! $('#available-widgets').droppable({
! tolerance: 'pointer',
! accept: function(o){
! return $(o).parent().attr('id') != 'widget-list';
! },
! drop: function(e,ui) {
! ui.draggable.addClass('deleting');
! $('#removing-widget').hide().children('span').html('');
! },
! over: function(e,ui) {
! ui.draggable.addClass('deleting');
! $('div.widget-placeholder').hide();
!
! if ( ui.draggable.hasClass('ui-sortable-helper') )
! $('#removing-widget').show().children('span')
! .html( ui.draggable.find('div.widget-title').children('h4').html() );
! },
! out: function(e,ui) {
! ui.draggable.removeClass('deleting');
! $('div.widget-placeholder').show();
! $('#removing-widget').hide().children('span').html('');
! }
! });
! },
!
! saveOrder : function(sb) {
! if ( sb )
! $('#' + sb).closest('div.widgets-holder-wrap').find('.spinner').css('display', 'inline-block');
!
! var a = {
! action: 'widgets-order',
! savewidgets: $('#_wpnonce_widgets').val(),
! sidebars: []
! };
!
! $('div.widgets-sortables').each( function() {
! if ( $(this).sortable )
! a['sidebars[' + $(this).attr('id') + ']'] = $(this).sortable('toArray').join(',');
! });
!
! $.post( ajaxurl, a, function() {
! $('.spinner').hide();
! });
!
! this.resize();
! },
!
! save : function(widget, del, animate, order) {
! var sb = widget.closest('div.widgets-sortables').attr('id'), data = widget.find('form').serialize(), a;
! widget = $(widget);
! $('.spinner', widget).show();
!
! a = {
! action: 'save-widget',
! savewidgets: $('#_wpnonce_widgets').val(),
! sidebar: sb
! };
!
! if ( del )
! a['delete_widget'] = 1;
!
! data += '&' + $.param(a);
!
! $.post( ajaxurl, data, function(r){
! var id;
!
! if ( del ) {
! if ( !$('input.widget_number', widget).val() ) {
! id = $('input.widget-id', widget).val();
! $('#available-widgets').find('input.widget-id').each(function(){
! if ( $(this).val() == id )
! $(this).closest('div.widget').show();
! });
! }
!
! if ( animate ) {
! order = 0;
! widget.slideUp('fast', function(){
! $(this).remove();
! wpWidgets.saveOrder();
! });
! } else {
! widget.remove();
! wpWidgets.resize();
! }
! } else {
! $('.spinner').hide();
! if ( r && r.length > 2 ) {
! $('div.widget-content', widget).html(r);
! wpWidgets.appendTitle(widget);
! wpWidgets.fixLabels(widget);
! }
! }
! if ( order )
! wpWidgets.saveOrder();
! });
! },
!
! appendTitle : function(widget) {
! var title = $('input[id*="-title"]', widget).val() || '';
!
! if ( title )
! title = ': ' + title.replace(/<[^<>]+>/g, '').replace(//g, '>');
!
! $(widget).children('.widget-top').children('.widget-title').children()
! .children('.in-widget-title').html(title);
!
! },
!
! resize : function() {
! $('div.widgets-sortables').each(function(){
! if ( $(this).parent().hasClass('inactive') )
! return true;
!
! var h = 50, H = $(this).children('.widget').length;
! h = h + parseInt(H * 48, 10);
! $(this).css( 'minHeight', h + 'px' );
! });
! },
!
! fixLabels : function(widget) {
! widget.children('.widget-inside').find('label').each(function(){
! var f = $(this).attr('for');
! if ( f && f == $('input', this).attr('id') )
! $(this).removeAttr('for');
! });
! },
!
! close : function(widget) {
! widget.children('.widget-inside').slideUp('fast', function(){
! widget.css({'width':'', margin:''});
! });
! }
! };
!
! $(document).ready(function($){ wpWidgets.init(); });
!
! })(jQuery);
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/widgets.min.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/widgets.min.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/widgets.min.js 1969-12-31 17:00:00.000000000 -0700
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/widgets.min.js 2012-09-26 17:58:46.000000000 -0500
***************
*** 0 ****
--- 1 ----
+ var wpWidgets;(function(a){wpWidgets={init:function(){var f,d=a("div.widgets-sortables"),c=!!("undefined"!=typeof isRtl&&isRtl),e=(isRtl?"marginRight":"marginLeft"),b;a("#widgets-right").children(".widgets-holder-wrap").children(".sidebar-name").click(function(){var h=a(this).siblings(".widgets-sortables"),g=a(this).parent();if(!g.hasClass("closed")){h.sortable("disable");g.addClass("closed")}else{g.removeClass("closed");h.sortable("enable").sortable("refresh")}});a("#widgets-left").children(".widgets-holder-wrap").children(".sidebar-name").click(function(){a(this).parent().toggleClass("closed")});d.each(function(){if(a(this).parent().hasClass("inactive")){return true}var i=50,g=a(this).children(".widget").length;i=i+parseInt(g*48,10);a(this).css("minHeight",i+"px")});a(document.body).bind("click.widgets-toggle",function(l){var k=a(l.target),i={},j,g,h;if(k.parents(".widget-top").length&&!k.parents("#available-widgets").length){j=k.closest("div.widget");g=j.children(".widget-inside");h=parseInt(j.find("input.widget-width").val(),10);if(g.is(":hidden")){if(h>250&&g.closest("div.widgets-sortables").length){i.width=h+30+"px";if(g.closest("div.widget-liquid-right").length){i[e]=235-h+"px"}j.css(i)}wpWidgets.fixLabels(j);g.slideDown("fast")}else{g.slideUp("fast",function(){j.css({width:"",margin:""})})}l.preventDefault()}else{if(k.hasClass("widget-control-save")){wpWidgets.save(k.closest("div.widget"),0,1,0);l.preventDefault()}else{if(k.hasClass("widget-control-remove")){wpWidgets.save(k.closest("div.widget"),1,1,0);l.preventDefault()}else{if(k.hasClass("widget-control-close")){wpWidgets.close(k.closest("div.widget"));l.preventDefault()}}}}});d.children(".widget").each(function(){wpWidgets.appendTitle(this);if(a("p.widget-error",this).length){a("a.widget-action",this).click()}});a("#widget-list").children(".widget").draggable({connectToSortable:"div.widgets-sortables",handle:"> .widget-top > .widget-title",distance:2,helper:"clone",zIndex:100,containment:"document",start:function(h,g){g.helper.find("div.widget-description").hide();b=this.id},stop:function(h,g){if(f){a(f).hide()}f=""}});d.sortable({placeholder:"widget-placeholder",items:"> .widget",handle:"> .widget-top > .widget-title",cursor:"move",distance:2,containment:"document",start:function(h,g){g.item.children(".widget-inside").hide();g.item.css({margin:"",width:""})},stop:function(i,g){if(g.item.hasClass("ui-draggable")&&g.item.data("draggable")){g.item.draggable("destroy")}if(g.item.hasClass("deleting")){wpWidgets.save(g.item,1,0,1);g.item.remove();return}var h=g.item.find("input.add_new").val(),l=g.item.find("input.multi_number").val(),k=b,j=a(this).attr("id");g.item.css({margin:"",width:""});b="";if(h){if("multi"==h){g.item.html(g.item.html().replace(/<[^<>]+>/g,function(n){return n.replace(/__i__|%i%/g,l)}));g.item.attr("id",k.replace("__i__",l));l++;a("div#"+k).find("input.multi_number").val(l)}else{if("single"==h){g.item.attr("id","new-"+k);f="div#"+k}}wpWidgets.save(g.item,0,0,1);g.item.find("input.add_new").val("");g.item.find("a.widget-action").click();return}wpWidgets.saveOrder(j)},receive:function(i,h){var g=a(h.sender);if(!a(this).is(":visible")||this.id.indexOf("orphaned_widgets")!=-1){g.sortable("cancel")}if(g.attr("id").indexOf("orphaned_widgets")!=-1&&!g.children(".widget").length){g.parents(".orphan-sidebar").slideUp(400,function(){a(this).remove()})}}}).sortable("option","connectWith","div.widgets-sortables").parent().filter(".closed").children(".widgets-sortables").sortable("disable");a("#available-widgets").droppable({tolerance:"pointer",accept:function(g){return a(g).parent().attr("id")!="widget-list"},drop:function(h,g){g.draggable.addClass("deleting");a("#removing-widget").hide().children("span").html("")},over:function(h,g){g.draggable.addClass("deleting");a("div.widget-placeholder").hide();if(g.draggable.hasClass("ui-sortable-helper")){a("#removing-widget").show().children("span").html(g.draggable.find("div.widget-title").children("h4").html())}},out:function(h,g){g.draggable.removeClass("deleting");a("div.widget-placeholder").show();a("#removing-widget").hide().children("span").html("")}})},saveOrder:function(c){if(c){a("#"+c).closest("div.widgets-holder-wrap").find(".spinner").css("display","inline-block")}var b={action:"widgets-order",savewidgets:a("#_wpnonce_widgets").val(),sidebars:[]};a("div.widgets-sortables").each(function(){if(a(this).sortable){b["sidebars["+a(this).attr("id")+"]"]=a(this).sortable("toArray").join(",")}});a.post(ajaxurl,b,function(){a(".spinner").hide()});this.resize()},save:function(g,d,e,b){var h=g.closest("div.widgets-sortables").attr("id"),f=g.find("form").serialize(),c;g=a(g);a(".spinner",g).show();c={action:"save-widget",savewidgets:a("#_wpnonce_widgets").val(),sidebar:h};if(d){c.delete_widget=1}f+="&"+a.param(c);a.post(ajaxurl,f,function(i){var j;if(d){if(!a("input.widget_number",g).val()){j=a("input.widget-id",g).val();a("#available-widgets").find("input.widget-id").each(function(){if(a(this).val()==j){a(this).closest("div.widget").show()}})}if(e){b=0;g.slideUp("fast",function(){a(this).remove();wpWidgets.saveOrder()})}else{g.remove();wpWidgets.resize()}}else{a(".spinner").hide();if(i&&i.length>2){a("div.widget-content",g).html(i);wpWidgets.appendTitle(g);wpWidgets.fixLabels(g)}}if(b){wpWidgets.saveOrder()}})},appendTitle:function(b){var c=a('input[id*="-title"]',b).val()||"";if(c){c=": "+c.replace(/<[^<>]+>/g,"").replace(//g,">")}a(b).children(".widget-top").children(".widget-title").children().children(".in-widget-title").html(c)},resize:function(){a("div.widgets-sortables").each(function(){if(a(this).parent().hasClass("inactive")){return true}var c=50,b=a(this).children(".widget").length;c=c+parseInt(b*48,10);a(this).css("minHeight",c+"px")})},fixLabels:function(b){b.children(".widget-inside").find("label").each(function(){var c=a(this).attr("for");if(c&&c==a("input",this).attr("id")){a(this).removeAttr("for")}})},close:function(b){b.children(".widget-inside").slideUp("fast",function(){b.css({width:"",margin:""})})}};a(document).ready(function(b){wpWidgets.init()})})(jQuery);
\ No newline at end of file
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/word-count.dev.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/word-count.dev.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/word-count.dev.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/word-count.dev.js 1969-12-31 17:00:00.000000000 -0700
***************
*** 1,42 ****
- (function($,undefined) {
- wpWordCount = {
-
- settings : {
- strip : /<[a-zA-Z\/][^<>]*>/g, // strip HTML tags
- clean : /[0-9.(),;:!?%#$Âż'"_+=\\/-]+/g, // regexp to remove punctuation, etc.
- w : /\S\s+/g, // word-counting regexp
- c : /\S/g // char-counting regexp for asian languages
- },
-
- block : 0,
-
- wc : function(tx, type) {
- var t = this, w = $('.word-count'), tc = 0;
-
- if ( type === undefined )
- type = wordCountL10n.type;
- if ( type !== 'w' && type !== 'c' )
- type = 'w';
-
- if ( t.block )
- return;
-
- t.block = 1;
-
- setTimeout( function() {
- if ( tx ) {
- tx = tx.replace( t.settings.strip, ' ' ).replace( / | /gi, ' ' );
- tx = tx.replace( t.settings.clean, '' );
- tx.replace( t.settings[type], function(){tc++;} );
- }
- w.html(tc.toString());
-
- setTimeout( function() { t.block = 0; }, 2000 );
- }, 1 );
- }
- }
-
- $(document).bind( 'wpcountwords', function(e, txt) {
- wpWordCount.wc(txt);
- });
- }(jQuery));
--- 0 ----
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/word-count.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/word-count.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/word-count.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/word-count.js 2012-08-22 19:04:18.000000000 -0500
***************
*** 1 ****
! (function(a,b){wpWordCount={settings:{strip:/<[a-zA-Z\/][^<>]*>/g,clean:/[0-9.(),;:!?%#$Âż'"_+=\\/-]+/g,w:/\S\s+/g,c:/\S/g},block:0,wc:function(e,g){var f=this,d=a(".word-count"),c=0;if(g===b){g=wordCountL10n.type}if(g!=="w"&&g!=="c"){g="w"}if(f.block){return}f.block=1;setTimeout(function(){if(e){e=e.replace(f.settings.strip," ").replace(/ | /gi," ");e=e.replace(f.settings.clean,"");e.replace(f.settings[g],function(){c++})}d.html(c.toString());setTimeout(function(){f.block=0},2000)},1)}};a(document).bind("wpcountwords",function(d,c){wpWordCount.wc(c)})}(jQuery));
\ No newline at end of file
--- 1,42 ----
! (function($,undefined) {
! wpWordCount = {
!
! settings : {
! strip : /<[a-zA-Z\/][^<>]*>/g, // strip HTML tags
! clean : /[0-9.(),;:!?%#$Âż'"_+=\\/-]+/g, // regexp to remove punctuation, etc.
! w : /\S\s+/g, // word-counting regexp
! c : /\S/g // char-counting regexp for asian languages
! },
!
! block : 0,
!
! wc : function(tx, type) {
! var t = this, w = $('.word-count'), tc = 0;
!
! if ( type === undefined )
! type = wordCountL10n.type;
! if ( type !== 'w' && type !== 'c' )
! type = 'w';
!
! if ( t.block )
! return;
!
! t.block = 1;
!
! setTimeout( function() {
! if ( tx ) {
! tx = tx.replace( t.settings.strip, ' ' ).replace( / | /gi, ' ' );
! tx = tx.replace( t.settings.clean, '' );
! tx.replace( t.settings[type], function(){tc++;} );
! }
! w.html(tc.toString());
!
! setTimeout( function() { t.block = 0; }, 2000 );
! }, 1 );
! }
! }
!
! $(document).bind( 'wpcountwords', function(e, txt) {
! wpWordCount.wc(txt);
! });
! }(jQuery));
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/word-count.min.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/word-count.min.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/word-count.min.js 1969-12-31 17:00:00.000000000 -0700
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/word-count.min.js 2012-08-22 19:04:18.000000000 -0500
***************
*** 0 ****
--- 1 ----
+ (function(a,b){wpWordCount={settings:{strip:/<[a-zA-Z\/][^<>]*>/g,clean:/[0-9.(),;:!?%#$Âż'"_+=\\/-]+/g,w:/\S\s+/g,c:/\S/g},block:0,wc:function(e,g){var f=this,d=a(".word-count"),c=0;if(g===b){g=wordCountL10n.type}if(g!=="w"&&g!=="c"){g="w"}if(f.block){return}f.block=1;setTimeout(function(){if(e){e=e.replace(f.settings.strip," ").replace(/ | /gi," ");e=e.replace(f.settings.clean,"");e.replace(f.settings[g],function(){c++})}d.html(c.toString());setTimeout(function(){f.block=0},2000)},1)}};a(document).bind("wpcountwords",function(d,c){wpWordCount.wc(c)})}(jQuery));
\ No newline at end of file
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/wp-fullscreen.dev.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/wp-fullscreen.dev.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/wp-fullscreen.dev.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/wp-fullscreen.dev.js 1969-12-31 17:00:00.000000000 -0700
***************
*** 1,731 ****
- /**
- * PubSub
- *
- * A lightweight publish/subscribe implementation.
- * Private use only!
- */
- var PubSub, fullscreen, wptitlehint;
-
- PubSub = function() {
- this.topics = {};
- };
-
- PubSub.prototype.subscribe = function( topic, callback ) {
- if ( ! this.topics[ topic ] )
- this.topics[ topic ] = [];
-
- this.topics[ topic ].push( callback );
- return callback;
- };
-
- PubSub.prototype.unsubscribe = function( topic, callback ) {
- var i, l,
- topics = this.topics[ topic ];
-
- if ( ! topics )
- return callback || [];
-
- // Clear matching callbacks
- if ( callback ) {
- for ( i = 0, l = topics.length; i < l; i++ ) {
- if ( callback == topics[i] )
- topics.splice( i, 1 );
- }
- return callback;
-
- // Clear all callbacks
- } else {
- this.topics[ topic ] = [];
- return topics;
- }
- };
-
- PubSub.prototype.publish = function( topic, args ) {
- var i, l, broken,
- topics = this.topics[ topic ];
-
- if ( ! topics )
- return;
-
- args = args || [];
-
- for ( i = 0, l = topics.length; i < l; i++ ) {
- broken = ( topics[i].apply( null, args ) === false || broken );
- }
- return ! broken;
- };
-
- /**
- * Distraction Free Writing
- * (wp-fullscreen)
- *
- * Access the API globally using the fullscreen variable.
- */
-
- (function($){
- var api, ps, bounder, s;
-
- // Initialize the fullscreen/api object
- fullscreen = api = {};
-
- // Create the PubSub (publish/subscribe) interface.
- ps = api.pubsub = new PubSub();
- timer = 0;
- block = false;
-
- s = api.settings = { // Settings
- visible : false,
- mode : 'tinymce',
- editor_id : 'content',
- title_id : '',
- timer : 0,
- toolbar_shown : false
- }
-
- /**
- * Bounder
- *
- * Creates a function that publishes start/stop topics.
- * Used to throttle events.
- */
- bounder = api.bounder = function( start, stop, delay, e ) {
- var y, top;
-
- delay = delay || 1250;
-
- if ( e ) {
- y = e.pageY || e.clientY || e.offsetY;
- top = $(document).scrollTop();
-
- if ( !e.isDefaultPrevented ) // test if e ic jQuery normalized
- y = 135 + y;
-
- if ( y - top > 120 )
- return;
- }
-
- if ( block )
- return;
-
- block = true;
-
- setTimeout( function() {
- block = false;
- }, 400 );
-
- if ( s.timer )
- clearTimeout( s.timer );
- else
- ps.publish( start );
-
- function timed() {
- ps.publish( stop );
- s.timer = 0;
- }
-
- s.timer = setTimeout( timed, delay );
- };
-
- /**
- * on()
- *
- * Turns fullscreen on.
- *
- * @param string mode Optional. Switch to the given mode before opening.
- */
- api.on = function() {
- if ( s.visible )
- return;
-
- // Settings can be added or changed by defining "wp_fullscreen_settings" JS object.
- if ( typeof(wp_fullscreen_settings) == 'object' )
- $.extend( s, wp_fullscreen_settings );
-
- s.editor_id = wpActiveEditor || 'content';
-
- if ( $('input#title').length && s.editor_id == 'content' )
- s.title_id = 'title';
- else if ( $('input#' + s.editor_id + '-title').length ) // the title input field should have [editor_id]-title HTML ID to be auto detected
- s.title_id = s.editor_id + '-title';
- else
- $('#wp-fullscreen-title, #wp-fullscreen-title-prompt-text').hide();
-
- s.mode = $('#' + s.editor_id).is(':hidden') ? 'tinymce' : 'html';
- s.qt_canvas = $('#' + s.editor_id).get(0);
-
- if ( ! s.element )
- api.ui.init();
-
- s.is_mce_on = s.has_tinymce && typeof( tinyMCE.get(s.editor_id) ) != 'undefined';
-
- api.ui.fade( 'show', 'showing', 'shown' );
- };
-
- /**
- * off()
- *
- * Turns fullscreen off.
- */
- api.off = function() {
- if ( ! s.visible )
- return;
-
- api.ui.fade( 'hide', 'hiding', 'hidden' );
- };
-
- /**
- * switchmode()
- *
- * @return string - The current mode.
- *
- * @param string to - The fullscreen mode to switch to.
- * @event switchMode
- * @eventparam string to - The new mode.
- * @eventparam string from - The old mode.
- */
- api.switchmode = function( to ) {
- var from = s.mode;
-
- if ( ! to || ! s.visible || ! s.has_tinymce )
- return from;
-
- // Don't switch if the mode is the same.
- if ( from == to )
- return from;
-
- ps.publish( 'switchMode', [ from, to ] );
- s.mode = to;
- ps.publish( 'switchedMode', [ from, to ] );
-
- return to;
- };
-
- /**
- * General
- */
-
- api.save = function() {
- var hidden = $('#hiddenaction'), old = hidden.val(), spinner = $('#wp-fullscreen-save img'),
- message = $('#wp-fullscreen-save span');
-
- spinner.show();
- api.savecontent();
-
- hidden.val('wp-fullscreen-save-post');
-
- $.post( ajaxurl, $('form#post').serialize(), function(r){
- spinner.hide();
- message.show();
-
- setTimeout( function(){
- message.fadeOut(1000);
- }, 3000 );
-
- if ( r.last_edited )
- $('#wp-fullscreen-save input').attr( 'title', r.last_edited );
-
- }, 'json');
-
- hidden.val(old);
- }
-
- api.savecontent = function() {
- var ed, content;
-
- if ( s.title_id )
- $('#' + s.title_id).val( $('#wp-fullscreen-title').val() );
-
- if ( s.mode === 'tinymce' && (ed = tinyMCE.get('wp_mce_fullscreen')) ) {
- content = ed.save();
- } else {
- content = $('#wp_mce_fullscreen').val();
- }
-
- $('#' + s.editor_id).val( content );
- $(document).triggerHandler('wpcountwords', [ content ]);
- }
-
- set_title_hint = function( title ) {
- if ( ! title.val().length )
- title.siblings('label').css( 'visibility', '' );
- else
- title.siblings('label').css( 'visibility', 'hidden' );
- }
-
- api.dfw_width = function(n) {
- var el = $('#wp-fullscreen-wrap'), w = el.width();
-
- if ( !n ) { // reset to theme width
- el.width( $('#wp-fullscreen-central-toolbar').width() );
- deleteUserSetting('dfw_width');
- return;
- }
-
- w = n + w;
-
- if ( w < 200 || w > 1200 ) // sanity check
- return;
-
- el.width( w );
- setUserSetting('dfw_width', w);
- }
-
- ps.subscribe( 'showToolbar', function() {
- s.toolbars.removeClass('fade-1000').addClass('fade-300');
- api.fade.In( s.toolbars, 300, function(){ ps.publish('toolbarShown'); }, true );
- $('#wp-fullscreen-body').addClass('wp-fullscreen-focus');
- s.toolbar_shown = true;
- });
-
- ps.subscribe( 'hideToolbar', function() {
- s.toolbars.removeClass('fade-300').addClass('fade-1000');
- api.fade.Out( s.toolbars, 1000, function(){ ps.publish('toolbarHidden'); }, true );
- $('#wp-fullscreen-body').removeClass('wp-fullscreen-focus');
- });
-
- ps.subscribe( 'toolbarShown', function() {
- s.toolbars.removeClass('fade-300');
- });
-
- ps.subscribe( 'toolbarHidden', function() {
- s.toolbars.removeClass('fade-1000');
- s.toolbar_shown = false;
- });
-
- ps.subscribe( 'show', function() { // This event occurs before the overlay blocks the UI.
- var title;
-
- if ( s.title_id ) {
- title = $('#wp-fullscreen-title').val( $('#' + s.title_id).val() );
- set_title_hint( title );
- }
-
- $('#wp-fullscreen-save input').attr( 'title', $('#last-edit').text() );
-
- s.textarea_obj.value = s.qt_canvas.value;
-
- if ( s.has_tinymce && s.mode === 'tinymce' )
- tinyMCE.execCommand('wpFullScreenInit');
-
- s.orig_y = $(window).scrollTop();
- });
-
- ps.subscribe( 'showing', function() { // This event occurs while the DFW overlay blocks the UI.
- $( document.body ).addClass( 'fullscreen-active' );
- api.refresh_buttons();
-
- $( document ).bind( 'mousemove.fullscreen', function(e) { bounder( 'showToolbar', 'hideToolbar', 2000, e ); } );
- bounder( 'showToolbar', 'hideToolbar', 2000 );
-
- api.bind_resize();
- setTimeout( api.resize_textarea, 200 );
-
- // scroll to top so the user is not disoriented
- scrollTo(0, 0);
-
- // needed it for IE7 and compat mode
- $('#wpadminbar').hide();
- });
-
- ps.subscribe( 'shown', function() { // This event occurs after the DFW overlay is shown
- var interim_init;
-
- s.visible = true;
-
- // init the standard TinyMCE instance if missing
- if ( s.has_tinymce && ! s.is_mce_on ) {
-
- interim_init = function(mce, ed) {
- var el = ed.getElement(), old_val = el.value, settings = tinyMCEPreInit.mceInit[s.editor_id];
-
- if ( settings && settings.wpautop && typeof(switchEditors) != 'undefined' )
- el.value = switchEditors.wpautop( el.value );
-
- ed.onInit.add(function(ed) {
- ed.hide();
- ed.getElement().value = old_val;
- tinymce.onAddEditor.remove(interim_init);
- });
- };
-
- tinymce.onAddEditor.add(interim_init);
- tinyMCE.init(tinyMCEPreInit.mceInit[s.editor_id]);
-
- s.is_mce_on = true;
- }
-
- wpActiveEditor = 'wp_mce_fullscreen';
- });
-
- ps.subscribe( 'hide', function() { // This event occurs before the overlay blocks DFW.
- var htmled_is_hidden = $('#' + s.editor_id).is(':hidden');
- // Make sure the correct editor is displaying.
- if ( s.has_tinymce && s.mode === 'tinymce' && !htmled_is_hidden ) {
- switchEditors.go(s.editor_id, 'tmce');
- } else if ( s.mode === 'html' && htmled_is_hidden ) {
- switchEditors.go(s.editor_id, 'html');
- }
-
- // Save content must be after switchEditors or content will be overwritten. See #17229.
- api.savecontent();
-
- $( document ).unbind( '.fullscreen' );
- $(s.textarea_obj).unbind('.grow');
-
- if ( s.has_tinymce && s.mode === 'tinymce' )
- tinyMCE.execCommand('wpFullScreenSave');
-
- if ( s.title_id )
- set_title_hint( $('#' + s.title_id) );
-
- s.qt_canvas.value = s.textarea_obj.value;
- });
-
- ps.subscribe( 'hiding', function() { // This event occurs while the overlay blocks the DFW UI.
-
- $( document.body ).removeClass( 'fullscreen-active' );
- scrollTo(0, s.orig_y);
- $('#wpadminbar').show();
- });
-
- ps.subscribe( 'hidden', function() { // This event occurs after DFW is removed.
- s.visible = false;
- $('#wp_mce_fullscreen, #wp-fullscreen-title').removeAttr('style');
-
- if ( s.has_tinymce && s.is_mce_on )
- tinyMCE.execCommand('wpFullScreenClose');
-
- s.textarea_obj.value = '';
- api.oldheight = 0;
- wpActiveEditor = s.editor_id;
- });
-
- ps.subscribe( 'switchMode', function( from, to ) {
- var ed;
-
- if ( !s.has_tinymce || !s.is_mce_on )
- return;
-
- ed = tinyMCE.get('wp_mce_fullscreen');
-
- if ( from === 'html' && to === 'tinymce' ) {
-
- if ( tinyMCE.get(s.editor_id).getParam('wpautop') && typeof(switchEditors) != 'undefined' )
- s.textarea_obj.value = switchEditors.wpautop( s.textarea_obj.value );
-
- if ( 'undefined' == typeof(ed) )
- tinyMCE.execCommand('wpFullScreenInit');
- else
- ed.show();
-
- } else if ( from === 'tinymce' && to === 'html' ) {
- if ( ed )
- ed.hide();
- }
- });
-
- ps.subscribe( 'switchedMode', function( from, to ) {
- api.refresh_buttons(true);
-
- if ( to === 'html' )
- setTimeout( api.resize_textarea, 200 );
- });
-
- /**
- * Buttons
- */
- api.b = function() {
- if ( s.has_tinymce && 'tinymce' === s.mode )
- tinyMCE.execCommand('Bold');
- }
-
- api.i = function() {
- if ( s.has_tinymce && 'tinymce' === s.mode )
- tinyMCE.execCommand('Italic');
- }
-
- api.ul = function() {
- if ( s.has_tinymce && 'tinymce' === s.mode )
- tinyMCE.execCommand('InsertUnorderedList');
- }
-
- api.ol = function() {
- if ( s.has_tinymce && 'tinymce' === s.mode )
- tinyMCE.execCommand('InsertOrderedList');
- }
-
- api.link = function() {
- if ( s.has_tinymce && 'tinymce' === s.mode )
- tinyMCE.execCommand('WP_Link');
- else
- wpLink.open();
- }
-
- api.unlink = function() {
- if ( s.has_tinymce && 'tinymce' === s.mode )
- tinyMCE.execCommand('unlink');
- }
-
- api.atd = function() {
- if ( s.has_tinymce && 'tinymce' === s.mode )
- tinyMCE.execCommand('mceWritingImprovementTool');
- }
-
- api.help = function() {
- if ( s.has_tinymce && 'tinymce' === s.mode )
- tinyMCE.execCommand('WP_Help');
- }
-
- api.blockquote = function() {
- if ( s.has_tinymce && 'tinymce' === s.mode )
- tinyMCE.execCommand('mceBlockQuote');
- }
-
- api.medialib = function() {
- if ( s.has_tinymce && 'tinymce' === s.mode ) {
- tinyMCE.execCommand('WP_Medialib');
- } else {
- var href = $('#wp-' + s.editor_id + '-media-buttons a.thickbox').attr('href') || '';
-
- if ( href )
- tb_show('', href);
- }
- }
-
- api.refresh_buttons = function( fade ) {
- fade = fade || false;
-
- if ( s.mode === 'html' ) {
- $('#wp-fullscreen-mode-bar').removeClass('wp-tmce-mode').addClass('wp-html-mode');
-
- if ( fade )
- $('#wp-fullscreen-button-bar').fadeOut( 150, function(){
- $(this).addClass('wp-html-mode').fadeIn( 150 );
- });
- else
- $('#wp-fullscreen-button-bar').addClass('wp-html-mode');
-
- } else if ( s.mode === 'tinymce' ) {
- $('#wp-fullscreen-mode-bar').removeClass('wp-html-mode').addClass('wp-tmce-mode');
-
- if ( fade )
- $('#wp-fullscreen-button-bar').fadeOut( 150, function(){
- $(this).removeClass('wp-html-mode').fadeIn( 150 );
- });
- else
- $('#wp-fullscreen-button-bar').removeClass('wp-html-mode');
- }
- }
-
- /**
- * UI Elements
- *
- * Used for transitioning between states.
- */
- api.ui = {
- init: function() {
- var topbar = $('#fullscreen-topbar'), txtarea = $('#wp_mce_fullscreen'), last = 0;
-
- s.toolbars = topbar.add( $('#wp-fullscreen-status') );
- s.element = $('#fullscreen-fader');
- s.textarea_obj = txtarea[0];
- s.has_tinymce = typeof(tinymce) != 'undefined';
-
- if ( !s.has_tinymce )
- $('#wp-fullscreen-mode-bar').hide();
-
- if ( wptitlehint && $('#wp-fullscreen-title').length )
- wptitlehint('wp-fullscreen-title');
-
- $(document).keyup(function(e){
- var c = e.keyCode || e.charCode, a, data;
-
- if ( !fullscreen.settings.visible )
- return true;
-
- if ( navigator.platform && navigator.platform.indexOf('Mac') != -1 )
- a = e.ctrlKey; // Ctrl key for Mac
- else
- a = e.altKey; // Alt key for Win & Linux
-
- if ( 27 == c ) { // Esc
- data = {
- event: e,
- what: 'dfw',
- cb: fullscreen.off,
- condition: function(){
- if ( $('#TB_window').is(':visible') || $('.wp-dialog').is(':visible') )
- return false;
- return true;
- }
- };
-
- if ( ! jQuery(document).triggerHandler( 'wp_CloseOnEscape', [data] ) )
- fullscreen.off();
- }
-
- if ( a && (61 == c || 107 == c || 187 == c) ) // +
- api.dfw_width(25);
-
- if ( a && (45 == c || 109 == c || 189 == c) ) // -
- api.dfw_width(-25);
-
- if ( a && 48 == c ) // 0
- api.dfw_width(0);
-
- return false;
- });
-
- // word count in HTML mode
- if ( typeof(wpWordCount) != 'undefined' ) {
-
- txtarea.keyup( function(e) {
- var k = e.keyCode || e.charCode;
-
- if ( k == last )
- return true;
-
- if ( 13 == k || 8 == last || 46 == last )
- $(document).triggerHandler('wpcountwords', [ txtarea.val() ]);
-
- last = k;
- return true;
- });
- }
-
- topbar.mouseenter(function(e){
- s.toolbars.addClass('fullscreen-make-sticky');
- $( document ).unbind( '.fullscreen' );
- clearTimeout( s.timer );
- s.timer = 0;
- }).mouseleave(function(e){
- s.toolbars.removeClass('fullscreen-make-sticky');
-
- if ( s.visible )
- $( document ).bind( 'mousemove.fullscreen', function(e) { bounder( 'showToolbar', 'hideToolbar', 2000, e ); } );
- });
- },
-
- fade: function( before, during, after ) {
- if ( ! s.element )
- api.ui.init();
-
- // If any callback bound to before returns false, bail.
- if ( before && ! ps.publish( before ) )
- return;
-
- api.fade.In( s.element, 600, function() {
- if ( during )
- ps.publish( during );
-
- api.fade.Out( s.element, 600, function() {
- if ( after )
- ps.publish( after );
- })
- });
- }
- };
-
- api.fade = {
- transitionend: 'transitionend webkitTransitionEnd oTransitionEnd',
-
- // Sensitivity to allow browsers to render the blank element before animating.
- sensitivity: 100,
-
- In: function( element, speed, callback, stop ) {
-
- callback = callback || $.noop;
- speed = speed || 400;
- stop = stop || false;
-
- if ( api.fade.transitions ) {
- if ( element.is(':visible') ) {
- element.addClass( 'fade-trigger' );
- return element;
- }
-
- element.show();
- element.first().one( this.transitionend, function() {
- callback();
- });
- setTimeout( function() { element.addClass( 'fade-trigger' ); }, this.sensitivity );
- } else {
- if ( stop )
- element.stop();
-
- element.css( 'opacity', 1 );
- element.first().fadeIn( speed, callback );
-
- if ( element.length > 1 )
- element.not(':first').fadeIn( speed );
- }
-
- return element;
- },
-
- Out: function( element, speed, callback, stop ) {
-
- callback = callback || $.noop;
- speed = speed || 400;
- stop = stop || false;
-
- if ( ! element.is(':visible') )
- return element;
-
- if ( api.fade.transitions ) {
- element.first().one( api.fade.transitionend, function() {
- if ( element.hasClass('fade-trigger') )
- return;
-
- element.hide();
- callback();
- });
- setTimeout( function() { element.removeClass( 'fade-trigger' ); }, this.sensitivity );
- } else {
- if ( stop )
- element.stop();
-
- element.first().fadeOut( speed, callback );
-
- if ( element.length > 1 )
- element.not(':first').fadeOut( speed );
- }
-
- return element;
- },
-
- transitions: (function() { // Check if the browser supports CSS 3.0 transitions
- var s = document.documentElement.style;
-
- return ( typeof ( s.WebkitTransition ) == 'string' ||
- typeof ( s.MozTransition ) == 'string' ||
- typeof ( s.OTransition ) == 'string' ||
- typeof ( s.transition ) == 'string' );
- })()
- };
-
- /**
- * Resize API
- *
- * Automatically updates textarea height.
- */
-
- api.bind_resize = function() {
- $(s.textarea_obj).bind('keypress.grow click.grow paste.grow', function(){
- setTimeout( api.resize_textarea, 200 );
- });
- }
-
- api.oldheight = 0;
- api.resize_textarea = function() {
- var txt = s.textarea_obj, newheight;
-
- newheight = txt.scrollHeight > 300 ? txt.scrollHeight : 300;
-
- if ( newheight != api.oldheight ) {
- txt.style.height = newheight + 'px';
- api.oldheight = newheight;
- }
- };
-
- })(jQuery);
--- 0 ----
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/wp-fullscreen.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/wp-fullscreen.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/wp-fullscreen.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/wp-fullscreen.js 2012-11-27 13:09:00.000000000 -0600
***************
*** 1 ****
! var PubSub,fullscreen,wptitlehint;PubSub=function(){this.topics={}};PubSub.prototype.subscribe=function(a,b){if(!this.topics[a]){this.topics[a]=[]}this.topics[a].push(b);return b};PubSub.prototype.unsubscribe=function(b,e){var c,a,d=this.topics[b];if(!d){return e||[]}if(e){for(c=0,a=d.length;c120){return}}if(block){return}block=true;setTimeout(function(){block=false},400);if(a.timer){clearTimeout(a.timer)}else{e.publish(l)}function f(){e.publish(h);a.timer=0}a.timer=setTimeout(f,g)};b.on=function(){if(a.visible){return}if(typeof(wp_fullscreen_settings)=="object"){c.extend(a,wp_fullscreen_settings)}a.editor_id=wpActiveEditor||"content";if(c("input#title").length&&a.editor_id=="content"){a.title_id="title"}else{if(c("input#"+a.editor_id+"-title").length){a.title_id=a.editor_id+"-title"}else{c("#wp-fullscreen-title, #wp-fullscreen-title-prompt-text").hide()}}a.mode=c("#"+a.editor_id).is(":hidden")?"tinymce":"html";a.qt_canvas=c("#"+a.editor_id).get(0);if(!a.element){b.ui.init()}a.is_mce_on=a.has_tinymce&&typeof(tinyMCE.get(a.editor_id))!="undefined";b.ui.fade("show","showing","shown")};b.off=function(){if(!a.visible){return}b.ui.fade("hide","hiding","hidden")};b.switchmode=function(g){var f=a.mode;if(!g||!a.visible||!a.has_tinymce){return f}if(f==g){return f}e.publish("switchMode",[f,g]);a.mode=g;e.publish("switchedMode",[f,g]);return g};b.save=function(){var h=c("#hiddenaction"),f=h.val(),i=c("#wp-fullscreen-save img"),g=c("#wp-fullscreen-save span");i.show();b.savecontent();h.val("wp-fullscreen-save-post");c.post(ajaxurl,c("form#post").serialize(),function(j){i.hide();g.show();setTimeout(function(){g.fadeOut(1000)},3000);if(j.last_edited){c("#wp-fullscreen-save input").attr("title",j.last_edited)}},"json");h.val(f)};b.savecontent=function(){var f,g;if(a.title_id){c("#"+a.title_id).val(c("#wp-fullscreen-title").val())}if(a.mode==="tinymce"&&(f=tinyMCE.get("wp_mce_fullscreen"))){g=f.save()}else{g=c("#wp_mce_fullscreen").val()}c("#"+a.editor_id).val(g);c(document).triggerHandler("wpcountwords",[g])};set_title_hint=function(f){if(!f.val().length){f.siblings("label").css("visibility","")}else{f.siblings("label").css("visibility","hidden")}};b.dfw_width=function(h){var g=c("#wp-fullscreen-wrap"),f=g.width();if(!h){g.width(c("#wp-fullscreen-central-toolbar").width());deleteUserSetting("dfw_width");return}f=h+f;if(f<200||f>1200){return}g.width(f);setUserSetting("dfw_width",f)};e.subscribe("showToolbar",function(){a.toolbars.removeClass("fade-1000").addClass("fade-300");b.fade.In(a.toolbars,300,function(){e.publish("toolbarShown")},true);c("#wp-fullscreen-body").addClass("wp-fullscreen-focus");a.toolbar_shown=true});e.subscribe("hideToolbar",function(){a.toolbars.removeClass("fade-300").addClass("fade-1000");b.fade.Out(a.toolbars,1000,function(){e.publish("toolbarHidden")},true);c("#wp-fullscreen-body").removeClass("wp-fullscreen-focus")});e.subscribe("toolbarShown",function(){a.toolbars.removeClass("fade-300")});e.subscribe("toolbarHidden",function(){a.toolbars.removeClass("fade-1000");a.toolbar_shown=false});e.subscribe("show",function(){var f;if(a.title_id){f=c("#wp-fullscreen-title").val(c("#"+a.title_id).val());set_title_hint(f)}c("#wp-fullscreen-save input").attr("title",c("#last-edit").text());a.textarea_obj.value=a.qt_canvas.value;if(a.has_tinymce&&a.mode==="tinymce"){tinyMCE.execCommand("wpFullScreenInit")}a.orig_y=c(window).scrollTop()});e.subscribe("showing",function(){c(document.body).addClass("fullscreen-active");b.refresh_buttons();c(document).bind("mousemove.fullscreen",function(f){d("showToolbar","hideToolbar",2000,f)});d("showToolbar","hideToolbar",2000);b.bind_resize();setTimeout(b.resize_textarea,200);scrollTo(0,0);c("#wpadminbar").hide()});e.subscribe("shown",function(){var f;a.visible=true;if(a.has_tinymce&&!a.is_mce_on){f=function(g,h){var k=h.getElement(),i=k.value,j=tinyMCEPreInit.mceInit[a.editor_id];if(j&&j.wpautop&&typeof(switchEditors)!="undefined"){k.value=switchEditors.wpautop(k.value)}h.onInit.add(function(l){l.hide();l.getElement().value=i;tinymce.onAddEditor.remove(f)})};tinymce.onAddEditor.add(f);tinyMCE.init(tinyMCEPreInit.mceInit[a.editor_id]);a.is_mce_on=true}wpActiveEditor="wp_mce_fullscreen"});e.subscribe("hide",function(){var f=c("#"+a.editor_id).is(":hidden");if(a.has_tinymce&&a.mode==="tinymce"&&!f){switchEditors.go(a.editor_id,"tmce")}else{if(a.mode==="html"&&f){switchEditors.go(a.editor_id,"html")}}b.savecontent();c(document).unbind(".fullscreen");c(a.textarea_obj).unbind(".grow");if(a.has_tinymce&&a.mode==="tinymce"){tinyMCE.execCommand("wpFullScreenSave")}if(a.title_id){set_title_hint(c("#"+a.title_id))}a.qt_canvas.value=a.textarea_obj.value});e.subscribe("hiding",function(){c(document.body).removeClass("fullscreen-active");scrollTo(0,a.orig_y);c("#wpadminbar").show()});e.subscribe("hidden",function(){a.visible=false;c("#wp_mce_fullscreen, #wp-fullscreen-title").removeAttr("style");if(a.has_tinymce&&a.is_mce_on){tinyMCE.execCommand("wpFullScreenClose")}a.textarea_obj.value="";b.oldheight=0;wpActiveEditor=a.editor_id});e.subscribe("switchMode",function(h,g){var f;if(!a.has_tinymce||!a.is_mce_on){return}f=tinyMCE.get("wp_mce_fullscreen");if(h==="html"&&g==="tinymce"){if(tinyMCE.get(a.editor_id).getParam("wpautop")&&typeof(switchEditors)!="undefined"){a.textarea_obj.value=switchEditors.wpautop(a.textarea_obj.value)}if("undefined"==typeof(f)){tinyMCE.execCommand("wpFullScreenInit")}else{f.show()}}else{if(h==="tinymce"&&g==="html"){if(f){f.hide()}}}});e.subscribe("switchedMode",function(g,f){b.refresh_buttons(true);if(f==="html"){setTimeout(b.resize_textarea,200)}});b.b=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("Bold")}};b.i=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("Italic")}};b.ul=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("InsertUnorderedList")}};b.ol=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("InsertOrderedList")}};b.link=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("WP_Link")}else{wpLink.open()}};b.unlink=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("unlink")}};b.atd=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("mceWritingImprovementTool")}};b.help=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("WP_Help")}};b.blockquote=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("mceBlockQuote")}};b.medialib=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("WP_Medialib")}else{var f=c("#wp-"+a.editor_id+"-media-buttons a.thickbox").attr("href")||"";if(f){tb_show("",f)}}};b.refresh_buttons=function(f){f=f||false;if(a.mode==="html"){c("#wp-fullscreen-mode-bar").removeClass("wp-tmce-mode").addClass("wp-html-mode");if(f){c("#wp-fullscreen-button-bar").fadeOut(150,function(){c(this).addClass("wp-html-mode").fadeIn(150)})}else{c("#wp-fullscreen-button-bar").addClass("wp-html-mode")}}else{if(a.mode==="tinymce"){c("#wp-fullscreen-mode-bar").removeClass("wp-html-mode").addClass("wp-tmce-mode");if(f){c("#wp-fullscreen-button-bar").fadeOut(150,function(){c(this).removeClass("wp-html-mode").fadeIn(150)})}else{c("#wp-fullscreen-button-bar").removeClass("wp-html-mode")}}}};b.ui={init:function(){var f=c("#fullscreen-topbar"),h=c("#wp_mce_fullscreen"),g=0;a.toolbars=f.add(c("#wp-fullscreen-status"));a.element=c("#fullscreen-fader");a.textarea_obj=h[0];a.has_tinymce=typeof(tinymce)!="undefined";if(!a.has_tinymce){c("#wp-fullscreen-mode-bar").hide()}if(wptitlehint&&c("#wp-fullscreen-title").length){wptitlehint("wp-fullscreen-title")}c(document).keyup(function(k){var l=k.keyCode||k.charCode,i,j;if(!fullscreen.settings.visible){return true}if(navigator.platform&&navigator.platform.indexOf("Mac")!=-1){i=k.ctrlKey}else{i=k.altKey}if(27==l){j={event:k,what:"dfw",cb:fullscreen.off,condition:function(){if(c("#TB_window").is(":visible")||c(".wp-dialog").is(":visible")){return false}return true}};if(!jQuery(document).triggerHandler("wp_CloseOnEscape",[j])){fullscreen.off()}}if(i&&(61==l||107==l||187==l)){b.dfw_width(25)}if(i&&(45==l||109==l||189==l)){b.dfw_width(-25)}if(i&&48==l){b.dfw_width(0)}return false});if(typeof(wpWordCount)!="undefined"){h.keyup(function(j){var i=j.keyCode||j.charCode;if(i==g){return true}if(13==i||8==g||46==g){c(document).triggerHandler("wpcountwords",[h.val()])}g=i;return true})}f.mouseenter(function(i){a.toolbars.addClass("fullscreen-make-sticky");c(document).unbind(".fullscreen");clearTimeout(a.timer);a.timer=0}).mouseleave(function(i){a.toolbars.removeClass("fullscreen-make-sticky");if(a.visible){c(document).bind("mousemove.fullscreen",function(j){d("showToolbar","hideToolbar",2000,j)})}})},fade:function(g,f,h){if(!a.element){b.ui.init()}if(g&&!e.publish(g)){return}b.fade.In(a.element,600,function(){if(f){e.publish(f)}b.fade.Out(a.element,600,function(){if(h){e.publish(h)}})})}};b.fade={transitionend:"transitionend webkitTransitionEnd oTransitionEnd",sensitivity:100,In:function(g,h,i,f){i=i||c.noop;h=h||400;f=f||false;if(b.fade.transitions){if(g.is(":visible")){g.addClass("fade-trigger");return g}g.show();g.first().one(this.transitionend,function(){i()});setTimeout(function(){g.addClass("fade-trigger")},this.sensitivity)}else{if(f){g.stop()}g.css("opacity",1);g.first().fadeIn(h,i);if(g.length>1){g.not(":first").fadeIn(h)}}return g},Out:function(g,h,i,f){i=i||c.noop;h=h||400;f=f||false;if(!g.is(":visible")){return g}if(b.fade.transitions){g.first().one(b.fade.transitionend,function(){if(g.hasClass("fade-trigger")){return}g.hide();i()});setTimeout(function(){g.removeClass("fade-trigger")},this.sensitivity)}else{if(f){g.stop()}g.first().fadeOut(h,i);if(g.length>1){g.not(":first").fadeOut(h)}}return g},transitions:(function(){var f=document.documentElement.style;return(typeof(f.WebkitTransition)=="string"||typeof(f.MozTransition)=="string"||typeof(f.OTransition)=="string"||typeof(f.transition)=="string")})()};b.bind_resize=function(){c(a.textarea_obj).bind("keypress.grow click.grow paste.grow",function(){setTimeout(b.resize_textarea,200)})};b.oldheight=0;b.resize_textarea=function(){var f=a.textarea_obj,g;g=f.scrollHeight>300?f.scrollHeight:300;if(g!=b.oldheight){f.style.height=g+"px";b.oldheight=g}}})(jQuery);
\ No newline at end of file
--- 1,725 ----
! /**
! * PubSub
! *
! * A lightweight publish/subscribe implementation.
! * Private use only!
! */
! var PubSub, fullscreen, wptitlehint;
!
! PubSub = function() {
! this.topics = {};
! };
!
! PubSub.prototype.subscribe = function( topic, callback ) {
! if ( ! this.topics[ topic ] )
! this.topics[ topic ] = [];
!
! this.topics[ topic ].push( callback );
! return callback;
! };
!
! PubSub.prototype.unsubscribe = function( topic, callback ) {
! var i, l,
! topics = this.topics[ topic ];
!
! if ( ! topics )
! return callback || [];
!
! // Clear matching callbacks
! if ( callback ) {
! for ( i = 0, l = topics.length; i < l; i++ ) {
! if ( callback == topics[i] )
! topics.splice( i, 1 );
! }
! return callback;
!
! // Clear all callbacks
! } else {
! this.topics[ topic ] = [];
! return topics;
! }
! };
!
! PubSub.prototype.publish = function( topic, args ) {
! var i, l, broken,
! topics = this.topics[ topic ];
!
! if ( ! topics )
! return;
!
! args = args || [];
!
! for ( i = 0, l = topics.length; i < l; i++ ) {
! broken = ( topics[i].apply( null, args ) === false || broken );
! }
! return ! broken;
! };
!
! /**
! * Distraction Free Writing
! * (wp-fullscreen)
! *
! * Access the API globally using the fullscreen variable.
! */
!
! (function($){
! var api, ps, bounder, s;
!
! // Initialize the fullscreen/api object
! fullscreen = api = {};
!
! // Create the PubSub (publish/subscribe) interface.
! ps = api.pubsub = new PubSub();
! timer = 0;
! block = false;
!
! s = api.settings = { // Settings
! visible : false,
! mode : 'tinymce',
! editor_id : 'content',
! title_id : '',
! timer : 0,
! toolbar_shown : false
! }
!
! /**
! * Bounder
! *
! * Creates a function that publishes start/stop topics.
! * Used to throttle events.
! */
! bounder = api.bounder = function( start, stop, delay, e ) {
! var y, top;
!
! delay = delay || 1250;
!
! if ( e ) {
! y = e.pageY || e.clientY || e.offsetY;
! top = $(document).scrollTop();
!
! if ( !e.isDefaultPrevented ) // test if e ic jQuery normalized
! y = 135 + y;
!
! if ( y - top > 120 )
! return;
! }
!
! if ( block )
! return;
!
! block = true;
!
! setTimeout( function() {
! block = false;
! }, 400 );
!
! if ( s.timer )
! clearTimeout( s.timer );
! else
! ps.publish( start );
!
! function timed() {
! ps.publish( stop );
! s.timer = 0;
! }
!
! s.timer = setTimeout( timed, delay );
! };
!
! /**
! * on()
! *
! * Turns fullscreen on.
! *
! * @param string mode Optional. Switch to the given mode before opening.
! */
! api.on = function() {
! if ( s.visible )
! return;
!
! // Settings can be added or changed by defining "wp_fullscreen_settings" JS object.
! if ( typeof(wp_fullscreen_settings) == 'object' )
! $.extend( s, wp_fullscreen_settings );
!
! s.editor_id = wpActiveEditor || 'content';
!
! if ( $('input#title').length && s.editor_id == 'content' )
! s.title_id = 'title';
! else if ( $('input#' + s.editor_id + '-title').length ) // the title input field should have [editor_id]-title HTML ID to be auto detected
! s.title_id = s.editor_id + '-title';
! else
! $('#wp-fullscreen-title, #wp-fullscreen-title-prompt-text').hide();
!
! s.mode = $('#' + s.editor_id).is(':hidden') ? 'tinymce' : 'html';
! s.qt_canvas = $('#' + s.editor_id).get(0);
!
! if ( ! s.element )
! api.ui.init();
!
! s.is_mce_on = s.has_tinymce && typeof( tinyMCE.get(s.editor_id) ) != 'undefined';
!
! api.ui.fade( 'show', 'showing', 'shown' );
! };
!
! /**
! * off()
! *
! * Turns fullscreen off.
! */
! api.off = function() {
! if ( ! s.visible )
! return;
!
! api.ui.fade( 'hide', 'hiding', 'hidden' );
! };
!
! /**
! * switchmode()
! *
! * @return string - The current mode.
! *
! * @param string to - The fullscreen mode to switch to.
! * @event switchMode
! * @eventparam string to - The new mode.
! * @eventparam string from - The old mode.
! */
! api.switchmode = function( to ) {
! var from = s.mode;
!
! if ( ! to || ! s.visible || ! s.has_tinymce )
! return from;
!
! // Don't switch if the mode is the same.
! if ( from == to )
! return from;
!
! ps.publish( 'switchMode', [ from, to ] );
! s.mode = to;
! ps.publish( 'switchedMode', [ from, to ] );
!
! return to;
! };
!
! /**
! * General
! */
!
! api.save = function() {
! var hidden = $('#hiddenaction'), old = hidden.val(), spinner = $('#wp-fullscreen-save .spinner'),
! message = $('#wp-fullscreen-save span');
!
! spinner.show();
! api.savecontent();
!
! hidden.val('wp-fullscreen-save-post');
!
! $.post( ajaxurl, $('form#post').serialize(), function(r){
! spinner.hide();
! message.show();
!
! setTimeout( function(){
! message.fadeOut(1000);
! }, 3000 );
!
! if ( r.last_edited )
! $('#wp-fullscreen-save input').attr( 'title', r.last_edited );
!
! }, 'json');
!
! hidden.val(old);
! }
!
! api.savecontent = function() {
! var ed, content;
!
! if ( s.title_id )
! $('#' + s.title_id).val( $('#wp-fullscreen-title').val() );
!
! if ( s.mode === 'tinymce' && (ed = tinyMCE.get('wp_mce_fullscreen')) ) {
! content = ed.save();
! } else {
! content = $('#wp_mce_fullscreen').val();
! }
!
! $('#' + s.editor_id).val( content );
! $(document).triggerHandler('wpcountwords', [ content ]);
! }
!
! set_title_hint = function( title ) {
! if ( ! title.val().length )
! title.siblings('label').css( 'visibility', '' );
! else
! title.siblings('label').css( 'visibility', 'hidden' );
! }
!
! api.dfw_width = function(n) {
! var el = $('#wp-fullscreen-wrap'), w = el.width();
!
! if ( !n ) { // reset to theme width
! el.width( $('#wp-fullscreen-central-toolbar').width() );
! deleteUserSetting('dfw_width');
! return;
! }
!
! w = n + w;
!
! if ( w < 200 || w > 1200 ) // sanity check
! return;
!
! el.width( w );
! setUserSetting('dfw_width', w);
! }
!
! ps.subscribe( 'showToolbar', function() {
! s.toolbars.removeClass('fade-1000').addClass('fade-300');
! api.fade.In( s.toolbars, 300, function(){ ps.publish('toolbarShown'); }, true );
! $('#wp-fullscreen-body').addClass('wp-fullscreen-focus');
! s.toolbar_shown = true;
! });
!
! ps.subscribe( 'hideToolbar', function() {
! s.toolbars.removeClass('fade-300').addClass('fade-1000');
! api.fade.Out( s.toolbars, 1000, function(){ ps.publish('toolbarHidden'); }, true );
! $('#wp-fullscreen-body').removeClass('wp-fullscreen-focus');
! });
!
! ps.subscribe( 'toolbarShown', function() {
! s.toolbars.removeClass('fade-300');
! });
!
! ps.subscribe( 'toolbarHidden', function() {
! s.toolbars.removeClass('fade-1000');
! s.toolbar_shown = false;
! });
!
! ps.subscribe( 'show', function() { // This event occurs before the overlay blocks the UI.
! var title;
!
! if ( s.title_id ) {
! title = $('#wp-fullscreen-title').val( $('#' + s.title_id).val() );
! set_title_hint( title );
! }
!
! $('#wp-fullscreen-save input').attr( 'title', $('#last-edit').text() );
!
! s.textarea_obj.value = s.qt_canvas.value;
!
! if ( s.has_tinymce && s.mode === 'tinymce' )
! tinyMCE.execCommand('wpFullScreenInit');
!
! s.orig_y = $(window).scrollTop();
! });
!
! ps.subscribe( 'showing', function() { // This event occurs while the DFW overlay blocks the UI.
! $( document.body ).addClass( 'fullscreen-active' );
! api.refresh_buttons();
!
! $( document ).bind( 'mousemove.fullscreen', function(e) { bounder( 'showToolbar', 'hideToolbar', 2000, e ); } );
! bounder( 'showToolbar', 'hideToolbar', 2000 );
!
! api.bind_resize();
! setTimeout( api.resize_textarea, 200 );
!
! // scroll to top so the user is not disoriented
! scrollTo(0, 0);
!
! // needed it for IE7 and compat mode
! $('#wpadminbar').hide();
! });
!
! ps.subscribe( 'shown', function() { // This event occurs after the DFW overlay is shown
! var interim_init;
!
! s.visible = true;
!
! // init the standard TinyMCE instance if missing
! if ( s.has_tinymce && ! s.is_mce_on ) {
!
! interim_init = function(mce, ed) {
! var el = ed.getElement(), old_val = el.value, settings = tinyMCEPreInit.mceInit[s.editor_id];
!
! if ( settings && settings.wpautop && typeof(switchEditors) != 'undefined' )
! el.value = switchEditors.wpautop( el.value );
!
! ed.onInit.add(function(ed) {
! ed.hide();
! ed.getElement().value = old_val;
! tinymce.onAddEditor.remove(interim_init);
! });
! };
!
! tinymce.onAddEditor.add(interim_init);
! tinyMCE.init(tinyMCEPreInit.mceInit[s.editor_id]);
!
! s.is_mce_on = true;
! }
!
! wpActiveEditor = 'wp_mce_fullscreen';
! });
!
! ps.subscribe( 'hide', function() { // This event occurs before the overlay blocks DFW.
! var htmled_is_hidden = $('#' + s.editor_id).is(':hidden');
! // Make sure the correct editor is displaying.
! if ( s.has_tinymce && s.mode === 'tinymce' && !htmled_is_hidden ) {
! switchEditors.go(s.editor_id, 'tmce');
! } else if ( s.mode === 'html' && htmled_is_hidden ) {
! switchEditors.go(s.editor_id, 'html');
! }
!
! // Save content must be after switchEditors or content will be overwritten. See #17229.
! api.savecontent();
!
! $( document ).unbind( '.fullscreen' );
! $(s.textarea_obj).unbind('.grow');
!
! if ( s.has_tinymce && s.mode === 'tinymce' )
! tinyMCE.execCommand('wpFullScreenSave');
!
! if ( s.title_id )
! set_title_hint( $('#' + s.title_id) );
!
! s.qt_canvas.value = s.textarea_obj.value;
! });
!
! ps.subscribe( 'hiding', function() { // This event occurs while the overlay blocks the DFW UI.
!
! $( document.body ).removeClass( 'fullscreen-active' );
! scrollTo(0, s.orig_y);
! $('#wpadminbar').show();
! });
!
! ps.subscribe( 'hidden', function() { // This event occurs after DFW is removed.
! s.visible = false;
! $('#wp_mce_fullscreen, #wp-fullscreen-title').removeAttr('style');
!
! if ( s.has_tinymce && s.is_mce_on )
! tinyMCE.execCommand('wpFullScreenClose');
!
! s.textarea_obj.value = '';
! api.oldheight = 0;
! wpActiveEditor = s.editor_id;
! });
!
! ps.subscribe( 'switchMode', function( from, to ) {
! var ed;
!
! if ( !s.has_tinymce || !s.is_mce_on )
! return;
!
! ed = tinyMCE.get('wp_mce_fullscreen');
!
! if ( from === 'html' && to === 'tinymce' ) {
!
! if ( tinyMCE.get(s.editor_id).getParam('wpautop') && typeof(switchEditors) != 'undefined' )
! s.textarea_obj.value = switchEditors.wpautop( s.textarea_obj.value );
!
! if ( 'undefined' == typeof(ed) )
! tinyMCE.execCommand('wpFullScreenInit');
! else
! ed.show();
!
! } else if ( from === 'tinymce' && to === 'html' ) {
! if ( ed )
! ed.hide();
! }
! });
!
! ps.subscribe( 'switchedMode', function( from, to ) {
! api.refresh_buttons(true);
!
! if ( to === 'html' )
! setTimeout( api.resize_textarea, 200 );
! });
!
! /**
! * Buttons
! */
! api.b = function() {
! if ( s.has_tinymce && 'tinymce' === s.mode )
! tinyMCE.execCommand('Bold');
! }
!
! api.i = function() {
! if ( s.has_tinymce && 'tinymce' === s.mode )
! tinyMCE.execCommand('Italic');
! }
!
! api.ul = function() {
! if ( s.has_tinymce && 'tinymce' === s.mode )
! tinyMCE.execCommand('InsertUnorderedList');
! }
!
! api.ol = function() {
! if ( s.has_tinymce && 'tinymce' === s.mode )
! tinyMCE.execCommand('InsertOrderedList');
! }
!
! api.link = function() {
! if ( s.has_tinymce && 'tinymce' === s.mode )
! tinyMCE.execCommand('WP_Link');
! else
! wpLink.open();
! }
!
! api.unlink = function() {
! if ( s.has_tinymce && 'tinymce' === s.mode )
! tinyMCE.execCommand('unlink');
! }
!
! api.atd = function() {
! if ( s.has_tinymce && 'tinymce' === s.mode )
! tinyMCE.execCommand('mceWritingImprovementTool');
! }
!
! api.help = function() {
! if ( s.has_tinymce && 'tinymce' === s.mode )
! tinyMCE.execCommand('WP_Help');
! }
!
! api.blockquote = function() {
! if ( s.has_tinymce && 'tinymce' === s.mode )
! tinyMCE.execCommand('mceBlockQuote');
! }
!
! api.medialib = function() {
! if ( typeof wp !== 'undefined' && wp.media && wp.media.editor )
! wp.media.editor.open(s.editor_id);
! }
!
! api.refresh_buttons = function( fade ) {
! fade = fade || false;
!
! if ( s.mode === 'html' ) {
! $('#wp-fullscreen-mode-bar').removeClass('wp-tmce-mode').addClass('wp-html-mode');
!
! if ( fade )
! $('#wp-fullscreen-button-bar').fadeOut( 150, function(){
! $(this).addClass('wp-html-mode').fadeIn( 150 );
! });
! else
! $('#wp-fullscreen-button-bar').addClass('wp-html-mode');
!
! } else if ( s.mode === 'tinymce' ) {
! $('#wp-fullscreen-mode-bar').removeClass('wp-html-mode').addClass('wp-tmce-mode');
!
! if ( fade )
! $('#wp-fullscreen-button-bar').fadeOut( 150, function(){
! $(this).removeClass('wp-html-mode').fadeIn( 150 );
! });
! else
! $('#wp-fullscreen-button-bar').removeClass('wp-html-mode');
! }
! }
!
! /**
! * UI Elements
! *
! * Used for transitioning between states.
! */
! api.ui = {
! init: function() {
! var topbar = $('#fullscreen-topbar'), txtarea = $('#wp_mce_fullscreen'), last = 0;
!
! s.toolbars = topbar.add( $('#wp-fullscreen-status') );
! s.element = $('#fullscreen-fader');
! s.textarea_obj = txtarea[0];
! s.has_tinymce = typeof(tinymce) != 'undefined';
!
! if ( !s.has_tinymce )
! $('#wp-fullscreen-mode-bar').hide();
!
! if ( wptitlehint && $('#wp-fullscreen-title').length )
! wptitlehint('wp-fullscreen-title');
!
! $(document).keyup(function(e){
! var c = e.keyCode || e.charCode, a, data;
!
! if ( !fullscreen.settings.visible )
! return true;
!
! if ( navigator.platform && navigator.platform.indexOf('Mac') != -1 )
! a = e.ctrlKey; // Ctrl key for Mac
! else
! a = e.altKey; // Alt key for Win & Linux
!
! if ( 27 == c ) { // Esc
! data = {
! event: e,
! what: 'dfw',
! cb: fullscreen.off,
! condition: function(){
! if ( $('#TB_window').is(':visible') || $('.wp-dialog').is(':visible') )
! return false;
! return true;
! }
! };
!
! if ( ! jQuery(document).triggerHandler( 'wp_CloseOnEscape', [data] ) )
! fullscreen.off();
! }
!
! if ( a && (61 == c || 107 == c || 187 == c) ) // +
! api.dfw_width(25);
!
! if ( a && (45 == c || 109 == c || 189 == c) ) // -
! api.dfw_width(-25);
!
! if ( a && 48 == c ) // 0
! api.dfw_width(0);
!
! return false;
! });
!
! // word count in Text mode
! if ( typeof(wpWordCount) != 'undefined' ) {
!
! txtarea.keyup( function(e) {
! var k = e.keyCode || e.charCode;
!
! if ( k == last )
! return true;
!
! if ( 13 == k || 8 == last || 46 == last )
! $(document).triggerHandler('wpcountwords', [ txtarea.val() ]);
!
! last = k;
! return true;
! });
! }
!
! topbar.mouseenter(function(e){
! s.toolbars.addClass('fullscreen-make-sticky');
! $( document ).unbind( '.fullscreen' );
! clearTimeout( s.timer );
! s.timer = 0;
! }).mouseleave(function(e){
! s.toolbars.removeClass('fullscreen-make-sticky');
!
! if ( s.visible )
! $( document ).bind( 'mousemove.fullscreen', function(e) { bounder( 'showToolbar', 'hideToolbar', 2000, e ); } );
! });
! },
!
! fade: function( before, during, after ) {
! if ( ! s.element )
! api.ui.init();
!
! // If any callback bound to before returns false, bail.
! if ( before && ! ps.publish( before ) )
! return;
!
! api.fade.In( s.element, 600, function() {
! if ( during )
! ps.publish( during );
!
! api.fade.Out( s.element, 600, function() {
! if ( after )
! ps.publish( after );
! })
! });
! }
! };
!
! api.fade = {
! transitionend: 'transitionend webkitTransitionEnd oTransitionEnd',
!
! // Sensitivity to allow browsers to render the blank element before animating.
! sensitivity: 100,
!
! In: function( element, speed, callback, stop ) {
!
! callback = callback || $.noop;
! speed = speed || 400;
! stop = stop || false;
!
! if ( api.fade.transitions ) {
! if ( element.is(':visible') ) {
! element.addClass( 'fade-trigger' );
! return element;
! }
!
! element.show();
! element.first().one( this.transitionend, function() {
! callback();
! });
! setTimeout( function() { element.addClass( 'fade-trigger' ); }, this.sensitivity );
! } else {
! if ( stop )
! element.stop();
!
! element.css( 'opacity', 1 );
! element.first().fadeIn( speed, callback );
!
! if ( element.length > 1 )
! element.not(':first').fadeIn( speed );
! }
!
! return element;
! },
!
! Out: function( element, speed, callback, stop ) {
!
! callback = callback || $.noop;
! speed = speed || 400;
! stop = stop || false;
!
! if ( ! element.is(':visible') )
! return element;
!
! if ( api.fade.transitions ) {
! element.first().one( api.fade.transitionend, function() {
! if ( element.hasClass('fade-trigger') )
! return;
!
! element.hide();
! callback();
! });
! setTimeout( function() { element.removeClass( 'fade-trigger' ); }, this.sensitivity );
! } else {
! if ( stop )
! element.stop();
!
! element.first().fadeOut( speed, callback );
!
! if ( element.length > 1 )
! element.not(':first').fadeOut( speed );
! }
!
! return element;
! },
!
! transitions: (function() { // Check if the browser supports CSS 3.0 transitions
! var s = document.documentElement.style;
!
! return ( typeof ( s.WebkitTransition ) == 'string' ||
! typeof ( s.MozTransition ) == 'string' ||
! typeof ( s.OTransition ) == 'string' ||
! typeof ( s.transition ) == 'string' );
! })()
! };
!
! /**
! * Resize API
! *
! * Automatically updates textarea height.
! */
!
! api.bind_resize = function() {
! $(s.textarea_obj).bind('keypress.grow click.grow paste.grow', function(){
! setTimeout( api.resize_textarea, 200 );
! });
! }
!
! api.oldheight = 0;
! api.resize_textarea = function() {
! var txt = s.textarea_obj, newheight;
!
! newheight = txt.scrollHeight > 300 ? txt.scrollHeight : 300;
!
! if ( newheight != api.oldheight ) {
! txt.style.height = newheight + 'px';
! api.oldheight = newheight;
! }
! };
!
! })(jQuery);
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/wp-fullscreen.min.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/wp-fullscreen.min.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/wp-fullscreen.min.js 1969-12-31 17:00:00.000000000 -0700
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/wp-fullscreen.min.js 2012-11-27 14:58:37.000000000 -0600
***************
*** 0 ****
--- 1 ----
+ var PubSub,fullscreen,wptitlehint;PubSub=function(){this.topics={}};PubSub.prototype.subscribe=function(a,b){if(!this.topics[a]){this.topics[a]=[]}this.topics[a].push(b);return b};PubSub.prototype.unsubscribe=function(b,e){var c,a,d=this.topics[b];if(!d){return e||[]}if(e){for(c=0,a=d.length;c120){return}}if(block){return}block=true;setTimeout(function(){block=false},400);if(a.timer){clearTimeout(a.timer)}else{e.publish(l)}function f(){e.publish(h);a.timer=0}a.timer=setTimeout(f,g)};b.on=function(){if(a.visible){return}if(typeof(wp_fullscreen_settings)=="object"){c.extend(a,wp_fullscreen_settings)}a.editor_id=wpActiveEditor||"content";if(c("input#title").length&&a.editor_id=="content"){a.title_id="title"}else{if(c("input#"+a.editor_id+"-title").length){a.title_id=a.editor_id+"-title"}else{c("#wp-fullscreen-title, #wp-fullscreen-title-prompt-text").hide()}}a.mode=c("#"+a.editor_id).is(":hidden")?"tinymce":"html";a.qt_canvas=c("#"+a.editor_id).get(0);if(!a.element){b.ui.init()}a.is_mce_on=a.has_tinymce&&typeof(tinyMCE.get(a.editor_id))!="undefined";b.ui.fade("show","showing","shown")};b.off=function(){if(!a.visible){return}b.ui.fade("hide","hiding","hidden")};b.switchmode=function(g){var f=a.mode;if(!g||!a.visible||!a.has_tinymce){return f}if(f==g){return f}e.publish("switchMode",[f,g]);a.mode=g;e.publish("switchedMode",[f,g]);return g};b.save=function(){var h=c("#hiddenaction"),f=h.val(),i=c("#wp-fullscreen-save .spinner"),g=c("#wp-fullscreen-save span");i.show();b.savecontent();h.val("wp-fullscreen-save-post");c.post(ajaxurl,c("form#post").serialize(),function(j){i.hide();g.show();setTimeout(function(){g.fadeOut(1000)},3000);if(j.last_edited){c("#wp-fullscreen-save input").attr("title",j.last_edited)}},"json");h.val(f)};b.savecontent=function(){var f,g;if(a.title_id){c("#"+a.title_id).val(c("#wp-fullscreen-title").val())}if(a.mode==="tinymce"&&(f=tinyMCE.get("wp_mce_fullscreen"))){g=f.save()}else{g=c("#wp_mce_fullscreen").val()}c("#"+a.editor_id).val(g);c(document).triggerHandler("wpcountwords",[g])};set_title_hint=function(f){if(!f.val().length){f.siblings("label").css("visibility","")}else{f.siblings("label").css("visibility","hidden")}};b.dfw_width=function(h){var g=c("#wp-fullscreen-wrap"),f=g.width();if(!h){g.width(c("#wp-fullscreen-central-toolbar").width());deleteUserSetting("dfw_width");return}f=h+f;if(f<200||f>1200){return}g.width(f);setUserSetting("dfw_width",f)};e.subscribe("showToolbar",function(){a.toolbars.removeClass("fade-1000").addClass("fade-300");b.fade.In(a.toolbars,300,function(){e.publish("toolbarShown")},true);c("#wp-fullscreen-body").addClass("wp-fullscreen-focus");a.toolbar_shown=true});e.subscribe("hideToolbar",function(){a.toolbars.removeClass("fade-300").addClass("fade-1000");b.fade.Out(a.toolbars,1000,function(){e.publish("toolbarHidden")},true);c("#wp-fullscreen-body").removeClass("wp-fullscreen-focus")});e.subscribe("toolbarShown",function(){a.toolbars.removeClass("fade-300")});e.subscribe("toolbarHidden",function(){a.toolbars.removeClass("fade-1000");a.toolbar_shown=false});e.subscribe("show",function(){var f;if(a.title_id){f=c("#wp-fullscreen-title").val(c("#"+a.title_id).val());set_title_hint(f)}c("#wp-fullscreen-save input").attr("title",c("#last-edit").text());a.textarea_obj.value=a.qt_canvas.value;if(a.has_tinymce&&a.mode==="tinymce"){tinyMCE.execCommand("wpFullScreenInit")}a.orig_y=c(window).scrollTop()});e.subscribe("showing",function(){c(document.body).addClass("fullscreen-active");b.refresh_buttons();c(document).bind("mousemove.fullscreen",function(f){d("showToolbar","hideToolbar",2000,f)});d("showToolbar","hideToolbar",2000);b.bind_resize();setTimeout(b.resize_textarea,200);scrollTo(0,0);c("#wpadminbar").hide()});e.subscribe("shown",function(){var f;a.visible=true;if(a.has_tinymce&&!a.is_mce_on){f=function(g,h){var k=h.getElement(),i=k.value,j=tinyMCEPreInit.mceInit[a.editor_id];if(j&&j.wpautop&&typeof(switchEditors)!="undefined"){k.value=switchEditors.wpautop(k.value)}h.onInit.add(function(l){l.hide();l.getElement().value=i;tinymce.onAddEditor.remove(f)})};tinymce.onAddEditor.add(f);tinyMCE.init(tinyMCEPreInit.mceInit[a.editor_id]);a.is_mce_on=true}wpActiveEditor="wp_mce_fullscreen"});e.subscribe("hide",function(){var f=c("#"+a.editor_id).is(":hidden");if(a.has_tinymce&&a.mode==="tinymce"&&!f){switchEditors.go(a.editor_id,"tmce")}else{if(a.mode==="html"&&f){switchEditors.go(a.editor_id,"html")}}b.savecontent();c(document).unbind(".fullscreen");c(a.textarea_obj).unbind(".grow");if(a.has_tinymce&&a.mode==="tinymce"){tinyMCE.execCommand("wpFullScreenSave")}if(a.title_id){set_title_hint(c("#"+a.title_id))}a.qt_canvas.value=a.textarea_obj.value});e.subscribe("hiding",function(){c(document.body).removeClass("fullscreen-active");scrollTo(0,a.orig_y);c("#wpadminbar").show()});e.subscribe("hidden",function(){a.visible=false;c("#wp_mce_fullscreen, #wp-fullscreen-title").removeAttr("style");if(a.has_tinymce&&a.is_mce_on){tinyMCE.execCommand("wpFullScreenClose")}a.textarea_obj.value="";b.oldheight=0;wpActiveEditor=a.editor_id});e.subscribe("switchMode",function(h,g){var f;if(!a.has_tinymce||!a.is_mce_on){return}f=tinyMCE.get("wp_mce_fullscreen");if(h==="html"&&g==="tinymce"){if(tinyMCE.get(a.editor_id).getParam("wpautop")&&typeof(switchEditors)!="undefined"){a.textarea_obj.value=switchEditors.wpautop(a.textarea_obj.value)}if("undefined"==typeof(f)){tinyMCE.execCommand("wpFullScreenInit")}else{f.show()}}else{if(h==="tinymce"&&g==="html"){if(f){f.hide()}}}});e.subscribe("switchedMode",function(g,f){b.refresh_buttons(true);if(f==="html"){setTimeout(b.resize_textarea,200)}});b.b=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("Bold")}};b.i=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("Italic")}};b.ul=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("InsertUnorderedList")}};b.ol=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("InsertOrderedList")}};b.link=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("WP_Link")}else{wpLink.open()}};b.unlink=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("unlink")}};b.atd=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("mceWritingImprovementTool")}};b.help=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("WP_Help")}};b.blockquote=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("mceBlockQuote")}};b.medialib=function(){if(typeof wp!=="undefined"&&wp.media&&wp.media.editor){wp.media.editor.open(a.editor_id)}};b.refresh_buttons=function(f){f=f||false;if(a.mode==="html"){c("#wp-fullscreen-mode-bar").removeClass("wp-tmce-mode").addClass("wp-html-mode");if(f){c("#wp-fullscreen-button-bar").fadeOut(150,function(){c(this).addClass("wp-html-mode").fadeIn(150)})}else{c("#wp-fullscreen-button-bar").addClass("wp-html-mode")}}else{if(a.mode==="tinymce"){c("#wp-fullscreen-mode-bar").removeClass("wp-html-mode").addClass("wp-tmce-mode");if(f){c("#wp-fullscreen-button-bar").fadeOut(150,function(){c(this).removeClass("wp-html-mode").fadeIn(150)})}else{c("#wp-fullscreen-button-bar").removeClass("wp-html-mode")}}}};b.ui={init:function(){var f=c("#fullscreen-topbar"),h=c("#wp_mce_fullscreen"),g=0;a.toolbars=f.add(c("#wp-fullscreen-status"));a.element=c("#fullscreen-fader");a.textarea_obj=h[0];a.has_tinymce=typeof(tinymce)!="undefined";if(!a.has_tinymce){c("#wp-fullscreen-mode-bar").hide()}if(wptitlehint&&c("#wp-fullscreen-title").length){wptitlehint("wp-fullscreen-title")}c(document).keyup(function(k){var l=k.keyCode||k.charCode,i,j;if(!fullscreen.settings.visible){return true}if(navigator.platform&&navigator.platform.indexOf("Mac")!=-1){i=k.ctrlKey}else{i=k.altKey}if(27==l){j={event:k,what:"dfw",cb:fullscreen.off,condition:function(){if(c("#TB_window").is(":visible")||c(".wp-dialog").is(":visible")){return false}return true}};if(!jQuery(document).triggerHandler("wp_CloseOnEscape",[j])){fullscreen.off()}}if(i&&(61==l||107==l||187==l)){b.dfw_width(25)}if(i&&(45==l||109==l||189==l)){b.dfw_width(-25)}if(i&&48==l){b.dfw_width(0)}return false});if(typeof(wpWordCount)!="undefined"){h.keyup(function(j){var i=j.keyCode||j.charCode;if(i==g){return true}if(13==i||8==g||46==g){c(document).triggerHandler("wpcountwords",[h.val()])}g=i;return true})}f.mouseenter(function(i){a.toolbars.addClass("fullscreen-make-sticky");c(document).unbind(".fullscreen");clearTimeout(a.timer);a.timer=0}).mouseleave(function(i){a.toolbars.removeClass("fullscreen-make-sticky");if(a.visible){c(document).bind("mousemove.fullscreen",function(j){d("showToolbar","hideToolbar",2000,j)})}})},fade:function(g,f,h){if(!a.element){b.ui.init()}if(g&&!e.publish(g)){return}b.fade.In(a.element,600,function(){if(f){e.publish(f)}b.fade.Out(a.element,600,function(){if(h){e.publish(h)}})})}};b.fade={transitionend:"transitionend webkitTransitionEnd oTransitionEnd",sensitivity:100,In:function(g,h,i,f){i=i||c.noop;h=h||400;f=f||false;if(b.fade.transitions){if(g.is(":visible")){g.addClass("fade-trigger");return g}g.show();g.first().one(this.transitionend,function(){i()});setTimeout(function(){g.addClass("fade-trigger")},this.sensitivity)}else{if(f){g.stop()}g.css("opacity",1);g.first().fadeIn(h,i);if(g.length>1){g.not(":first").fadeIn(h)}}return g},Out:function(g,h,i,f){i=i||c.noop;h=h||400;f=f||false;if(!g.is(":visible")){return g}if(b.fade.transitions){g.first().one(b.fade.transitionend,function(){if(g.hasClass("fade-trigger")){return}g.hide();i()});setTimeout(function(){g.removeClass("fade-trigger")},this.sensitivity)}else{if(f){g.stop()}g.first().fadeOut(h,i);if(g.length>1){g.not(":first").fadeOut(h)}}return g},transitions:(function(){var f=document.documentElement.style;return(typeof(f.WebkitTransition)=="string"||typeof(f.MozTransition)=="string"||typeof(f.OTransition)=="string"||typeof(f.transition)=="string")})()};b.bind_resize=function(){c(a.textarea_obj).bind("keypress.grow click.grow paste.grow",function(){setTimeout(b.resize_textarea,200)})};b.oldheight=0;b.resize_textarea=function(){var f=a.textarea_obj,g;g=f.scrollHeight>300?f.scrollHeight:300;if(g!=b.oldheight){f.style.height=g+"px";b.oldheight=g}}})(jQuery);
\ No newline at end of file
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/xfn.dev.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/xfn.dev.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/xfn.dev.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/xfn.dev.js 1969-12-31 17:00:00.000000000 -0700
***************
*** 1,16 ****
- jQuery(document).ready( function($) {
- $('#link_rel').prop('readonly', true);
- $('#linkxfndiv input').bind('click keyup', function() {
- var isMe = $('#me').is(':checked'), inputs = '';
- $('input.valinp').each( function() {
- if (isMe) {
- $(this).prop('disabled', true).parent().addClass('disabled');
- } else {
- $(this).removeAttr('disabled').parent().removeClass('disabled');
- if ( $(this).is(':checked') && $(this).val() != '')
- inputs += $(this).val() + ' ';
- }
- });
- $('#link_rel').val( (isMe) ? 'me' : inputs.substr(0,inputs.length - 1) );
- });
- });
--- 0 ----
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/xfn.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/xfn.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/xfn.js 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/xfn.js 2012-08-22 19:04:18.000000000 -0500
***************
*** 1 ****
! jQuery(document).ready(function(a){a("#link_rel").prop("readonly",true);a("#linkxfndiv input").bind("click keyup",function(){var c=a("#me").is(":checked"),b="";a("input.valinp").each(function(){if(c){a(this).prop("disabled",true).parent().addClass("disabled")}else{a(this).removeAttr("disabled").parent().removeClass("disabled");if(a(this).is(":checked")&&a(this).val()!=""){b+=a(this).val()+" "}}});a("#link_rel").val((c)?"me":b.substr(0,b.length-1))})});
\ No newline at end of file
--- 1,16 ----
! jQuery(document).ready( function($) {
! $('#link_rel').prop('readonly', true);
! $('#linkxfndiv input').bind('click keyup', function() {
! var isMe = $('#me').is(':checked'), inputs = '';
! $('input.valinp').each( function() {
! if (isMe) {
! $(this).prop('disabled', true).parent().addClass('disabled');
! } else {
! $(this).removeAttr('disabled').parent().removeClass('disabled');
! if ( $(this).is(':checked') && $(this).val() != '')
! inputs += $(this).val() + ' ';
! }
! });
! $('#link_rel').val( (isMe) ? 'me' : inputs.substr(0,inputs.length - 1) );
! });
! });
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/xfn.min.js /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/xfn.min.js
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/js/xfn.min.js 1969-12-31 17:00:00.000000000 -0700
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/js/xfn.min.js 2012-08-22 19:04:18.000000000 -0500
***************
*** 0 ****
--- 1 ----
+ jQuery(document).ready(function(a){a("#link_rel").prop("readonly",true);a("#linkxfndiv input").bind("click keyup",function(){var c=a("#me").is(":checked"),b="";a("input.valinp").each(function(){if(c){a(this).prop("disabled",true).parent().addClass("disabled")}else{a(this).removeAttr("disabled").parent().removeClass("disabled");if(a(this).is(":checked")&&a(this).val()!=""){b+=a(this).val()+" "}}});a("#link_rel").val((c)?"me":b.substr(0,b.length-1))})});
\ No newline at end of file
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/link.php /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/link.php
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/link.php 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/link.php 2012-11-26 18:20:27.000000000 -0600
***************
*** 15,21 ****
wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', 'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]'));
if ( ! current_user_can('manage_links') )
! wp_die( __('You do not have sufficient permissions to edit the links for this site.') );
if ( !empty($_POST['deletebookmarks']) )
$action = 'deletebookmarks';
--- 15,21 ----
wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', 'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]'));
if ( ! current_user_can('manage_links') )
! wp_link_manager_disabled_message();
if ( !empty($_POST['deletebookmarks']) )
$action = 'deletebookmarks';
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/load-scripts.php /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/load-scripts.php
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/load-scripts.php 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/load-scripts.php 2012-12-05 12:57:56.000000000 -0600
***************
*** 114,120 ****
return @file_get_contents($path);
}
! $load = preg_replace( '/[^a-z0-9,_-]+/i', '', $_GET['load'] );
$load = explode(',', $load);
if ( empty($load) )
--- 114,124 ----
return @file_get_contents($path);
}
! $load = $_GET['load'];
! if ( is_array( $load ) )
! $load = implode( '', $load );
!
! $load = preg_replace( '/[^a-z0-9,_-]+/i', '', $load );
$load = explode(',', $load);
if ( empty($load) )
***************
*** 125,131 ****
$compress = ( isset($_GET['c']) && $_GET['c'] );
$force_gzip = ( $compress && 'gzip' == $_GET['c'] );
! $expires_offset = 31536000;
$out = '';
$wp_scripts = new WP_Scripts();
--- 129,135 ----
$compress = ( isset($_GET['c']) && $_GET['c'] );
$force_gzip = ( $compress && 'gzip' == $_GET['c'] );
! $expires_offset = 31536000; // 1 year
$out = '';
$wp_scripts = new WP_Scripts();
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/load-styles.php /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/load-styles.php
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/load-styles.php 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/load-styles.php 2012-11-16 16:18:33.000000000 -0600
***************
*** 104,110 ****
$compress = ( isset($_GET['c']) && $_GET['c'] );
$force_gzip = ( $compress && 'gzip' == $_GET['c'] );
$rtl = ( isset($_GET['dir']) && 'rtl' == $_GET['dir'] );
! $expires_offset = 31536000;
$out = '';
$wp_styles = new WP_Styles();
--- 104,110 ----
$compress = ( isset($_GET['c']) && $_GET['c'] );
$force_gzip = ( $compress && 'gzip' == $_GET['c'] );
$rtl = ( isset($_GET['dir']) && 'rtl' == $_GET['dir'] );
! $expires_offset = 31536000; // 1 year
$out = '';
$wp_styles = new WP_Styles();
***************
*** 120,126 ****
$content = get_file($path) . "\n";
if ( $rtl && isset($style->extra['rtl']) && $style->extra['rtl'] ) {
! $rtl_path = is_bool($style->extra['rtl']) ? str_replace( '.css', '-rtl.css', $path ) : ABSPATH . $style->extra['rtl'];
$content .= get_file($rtl_path) . "\n";
}
--- 120,126 ----
$content = get_file($path) . "\n";
if ( $rtl && isset($style->extra['rtl']) && $style->extra['rtl'] ) {
! $rtl_path = is_bool($style->extra['rtl']) ? str_replace( '.min.css', '-rtl.min.css', $path ) : ABSPATH . $style->extra['rtl'];
$content .= get_file($rtl_path) . "\n";
}
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/maint/repair.php /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/maint/repair.php
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/maint/repair.php 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/maint/repair.php 2012-11-30 07:40:59.000000000 -0600
***************
*** 16,25 ****
<?php _e( 'WordPress › Database Repair' ); ?>
!
!
! <?php _e( 'WordPress › Database Repair' ); ?>
!
!
!
!
--- 104,112 ----
else
echo '' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '
';
?>
!
!
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/media-new.php /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/media-new.php
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/media-new.php 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/media-new.php 2012-11-27 16:41:15.000000000 -0600
***************
*** 1,12 ****
add_help_tab( array(
! 'id' => 'overview',
! 'title' => __('Overview'),
! 'content' =>
! '' . __('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:') . '
' .
! '' .
! '' . __('Drag and drop your files into the area below. Multiple files are allowed.') . ' ' .
! '' . __('Clicking Select Files opens a navigation window showing you files in your operating system. Selecting Open after clicking on the file you want activates a progress bar on the uploader screen.') . ' ' .
! '' . __('Revert to the Browser Uploader by clicking the link below the drag and drop box.') . ' ' .
! ' '
! ) );
! get_current_screen()->set_help_sidebar(
! '' . __('For more information:') . '
' .
! '' . __('Documentation on Uploading Media Files ') . '
' .
! '' . __('Support Forums ') . '
'
! );
!
! require_once( ABSPATH . 'wp-admin/admin-header.php' );
!
! $form_class = 'media-upload-form type-form validate';
!
! if ( get_user_setting('uploader') || isset( $_GET['browser-uploader'] ) )
! $form_class .= ' html-uploader';
! ?>
!
!
! add_help_tab( array(
- 'id' => 'overview',
- 'title' => __('Overview'),
- 'content' =>
- '' . __('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:') . '
' .
- '' .
- '' . __('Drag and drop your files into the area below. Multiple files are allowed.') . ' ' .
- '' . __('Clicking Select Files opens a navigation window showing you files in your operating system. Selecting Open after clicking on the file you want activates a progress bar on the uploader screen.') . ' ' .
- '' . __('Revert to the Browser Uploader by clicking the link below the drag and drop box.') . ' ' .
- ' ' .
- '' . __('Basic image editing is available after upload is complete. Make sure you click Save before leaving this screen.') . '
'
- ) );
- get_current_screen()->set_help_sidebar(
- '' . __('For more information:') . '
' .
- '' . __('Documentation on Uploading Media Files ') . '
' .
- '' . __('Support Forums ') . '
'
- );
-
- require_once('./admin-header.php');
-
- $form_class = 'media-upload-form type-form validate';
-
- if ( get_user_setting('uploader') )
- $form_class .= ' html-uploader';
- ?>
-
-
- $item ) {
$admin_is_parent = false;
$class = array();
! $aria_attributes = 'tabindex="1"';
if ( $first ) {
$class[] = 'wp-first-item';
--- 41,47 ----
foreach ( $menu as $key => $item ) {
$admin_is_parent = false;
$class = array();
! $aria_attributes = '';
if ( $first ) {
$class[] = 'wp-first-item';
***************
*** 59,65 ****
} else {
$class[] = 'wp-not-current-submenu';
if ( ! empty( $submenu_items ) )
! $aria_attributes .= ' aria-haspopup="true"';
}
if ( ! empty( $item[4] ) )
--- 59,65 ----
} else {
$class[] = 'wp-not-current-submenu';
if ( ! empty( $submenu_items ) )
! $aria_attributes .= 'aria-haspopup="true"';
}
if ( ! empty( $item[4] ) )
***************
*** 68,75 ****
$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
$id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
$img = '';
if ( ! empty( $item[6] ) )
! $img = ( 'div' === $item[6] ) ? '$title ";
} else {
! echo "\n\t$arrow$title ";
}
} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
$menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
--- 89,97 ----
$menu_file = substr( $menu_file, 0, $pos );
if ( ! empty( $menu_hook ) || ( ('index.php' != $submenu_items[0][2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) {
$admin_is_parent = true;
! echo "$arrow ";
} else {
! echo "\n\t$arrow ";
}
} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
$menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
***************
*** 98,118 ****
$menu_file = substr( $menu_file, 0, $pos );
if ( ! empty( $menu_hook ) || ( ('index.php' != $item[2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) {
$admin_is_parent = true;
! echo "\n\t$arrow{$item[0]} ";
} else {
! echo "\n\t$arrow{$item[0]} ";
}
}
if ( ! empty( $submenu_items ) ) {
! echo "\n\t";
}
echo "";
}
--- 158,169 ----
$sub_item_url = add_query_arg( array('page' => $sub_item[2]), 'admin.php' );
$sub_item_url = esc_url( $sub_item_url );
! echo "$title ";
} else {
! echo "$title ";
}
}
! echo "";
}
echo "";
}
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/menu.php /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/menu.php
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/menu.php 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/menu.php 2012-11-28 16:28:20.000000000 -0600
***************
*** 22,28 ****
* @var array
*/
! $menu[2] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'div' );
$submenu[ 'index.php' ][0] = array( __('Home'), 'read', 'index.php' );
--- 22,28 ----
* @var array
*/
! $menu[2] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'none' );
$submenu[ 'index.php' ][0] = array( __('Home'), 'read', 'index.php' );
***************
*** 34,48 ****
$update_data = wp_get_update_data();
if ( ! is_multisite() ) {
! $submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "" . number_format_i18n($update_data['counts']['total']) . " " . number_format_i18n($update_data['counts']['total']) . " " . number_format_i18n($awaiting_mod) . " " . number_format_i18n($awaiting_mod) . " " . number_format_i18n($update_data['counts']['plugins']) . " " . number_format_i18n($update_data['counts']['plugins']) . " domain : $blog->domain . $blog->path ); ?>
__('Overview'),
'content' =>
'' . __('This feature allows you to use a custom menu in place of your theme’s default menus.') . '
' .
! '' . __('Custom menus may contain links to pages, categories, custom links or other content types (use the Screen Options tab to decide which ones to show on the screen). You can specify a different navigation label for a menu item as well as other attributes. You can create multiple menus. If your theme includes more than one menu, you can choose which custom menu to associate with each. You can also use custom menus in conjunction with the Custom Menus widget.') . '
' .
! '' . __('If your theme does not support the custom menus feature yet (the default themes, Twenty Eleven and Twenty Ten, do), you can learn about adding this support by following the Documentation link to the side.') . '
'
) );
get_current_screen()->add_help_tab( array(
'id' => 'create-menus',
'title' => __('Create Menus'),
'content' =>
! '' . __('To create a new custom menu, click on the + tab, give the menu a name, and click Create Menu. Next, add menu items from the appropriate boxes. You’ll be able to edit the information for each menu item, and can drag and drop to put them in order. You can also drag a menu item a little to the right to make it a submenu, to create menus with hierarchy. Drop the item into its new nested placement when the dotted rectangle target shifts over, also a little to the right. Don’t forget to click Save when you’re finished.') . '
'
) );
get_current_screen()->set_help_sidebar(
--- 439,452 ----
'title' => __('Overview'),
'content' =>
'' . __('This feature allows you to use a custom menu in place of your theme’s default menus.') . '
' .
! '' . __('Custom menus may contain links to pages, categories, custom links or other content types (use the Screen Options tab to decide which ones to show on the screen). You can specify a different navigation label for a menu item as well as other attributes. You can create multiple menus. If your theme includes more than one menu location, you can choose which custom menu to associate with each. You can also use custom menus in conjunction with the Custom Menus widget.') . '
' .
! '' . sprintf( __('If your theme does not support the custom menus feature (the default themes, %1$s and %2$s, do), you can learn about adding this support by following the Documentation link to the side.'), 'Twenty Twelve', 'Twenty Eleven' ) . '
'
) );
get_current_screen()->add_help_tab( array(
'id' => 'create-menus',
'title' => __('Create Menus'),
'content' =>
! '' . __('To create a new custom menu, click on the + tab, give the menu a name, and click Create Menu. Next, add menu items from the appropriate boxes. You’ll be able to edit the information for each menu item, and can drag and drop to change their order. You can also drag a menu item a little to the right to make it a submenu. Don’t forget to click Save Menu when you’re finished.') . '
'
) );
get_current_screen()->set_help_sidebar(
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/network/menu.php /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/network/menu.php
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/network/menu.php 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/network/menu.php 2012-09-15 14:57:46.000000000 -0500
***************
*** 38,44 ****
$menu[20] = array( __('Plugins'), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div' );
}
$submenu['plugins.php'][5] = array( __('Installed Plugins'), 'manage_network_plugins', 'plugins.php' );
! $submenu['plugins.php'][10] = array( _x('Add New', 'plugin editor'), 'install_plugins', 'plugin-install.php' );
$submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
$menu[25] = array(__('Settings'), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'div');
--- 38,44 ----
$menu[20] = array( __('Plugins'), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div' );
}
$submenu['plugins.php'][5] = array( __('Installed Plugins'), 'manage_network_plugins', 'plugins.php' );
! $submenu['plugins.php'][10] = array( _x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php' );
$submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
$menu[25] = array(__('Settings'), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'div');
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/network/settings.php /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/network/settings.php
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/network/settings.php 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/network/settings.php 2012-09-24 20:54:12.000000000 -0500
***************
*** 44,96 ****
check_admin_referer( 'siteoptions' );
- if ( isset( $_POST['WPLANG'] ) && ( '' === $_POST['WPLANG'] || in_array( $_POST['WPLANG'], get_available_languages() ) ) )
- update_site_option( 'WPLANG', $_POST['WPLANG'] );
-
- if ( is_email( $_POST['admin_email'] ) )
- update_site_option( 'admin_email', $_POST['admin_email'] );
-
- $illegal_names = explode( ' ', $_POST['illegal_names'] );
- foreach ( (array) $illegal_names as $name ) {
- $name = trim( $name );
- if ( $name != '' )
- $names[] = trim( $name );
- }
- update_site_option( 'illegal_names', $names );
-
- if ( $_POST['limited_email_domains'] != '' ) {
- $limited_email_domains = str_replace( ' ', "\n", $_POST['limited_email_domains'] );
- $limited_email_domains = explode( "\n", stripslashes( $limited_email_domains ) );
- $limited_email = array();
- foreach ( (array) $limited_email_domains as $domain ) {
- $domain = trim( $domain );
- if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
- $limited_email[] = trim( $domain );
- }
- update_site_option( 'limited_email_domains', $limited_email );
- } else {
- update_site_option( 'limited_email_domains', '' );
- }
-
- if ( $_POST['banned_email_domains'] != '' ) {
- $banned_email_domains = explode( "\n", stripslashes( $_POST['banned_email_domains'] ) );
- $banned = array();
- foreach ( (array) $banned_email_domains as $domain ) {
- $domain = trim( $domain );
- if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
- $banned[] = trim( $domain );
- }
- update_site_option( 'banned_email_domains', $banned );
- } else {
- update_site_option( 'banned_email_domains', '' );
- }
-
- $options = array( 'registrationnotification', 'registration', 'add_new_users', 'menu_items', 'upload_space_check_disabled', 'blog_upload_space', 'upload_filetypes', 'site_name', 'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author', 'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'global_terms_enabled' );
$checked_options = array( 'menu_items' => array(), 'registrationnotification' => 'no', 'upload_space_check_disabled' => 1, 'add_new_users' => 0 );
foreach ( $checked_options as $option_name => $option_unchecked_value ) {
if ( ! isset( $_POST[$option_name] ) )
$_POST[$option_name] = $option_unchecked_value;
}
foreach ( $options as $option_name ) {
if ( ! isset($_POST[$option_name]) )
continue;
--- 44,63 ----
check_admin_referer( 'siteoptions' );
$checked_options = array( 'menu_items' => array(), 'registrationnotification' => 'no', 'upload_space_check_disabled' => 1, 'add_new_users' => 0 );
foreach ( $checked_options as $option_name => $option_unchecked_value ) {
if ( ! isset( $_POST[$option_name] ) )
$_POST[$option_name] = $option_unchecked_value;
}
+
+ $options = array(
+ 'registrationnotification', 'registration', 'add_new_users', 'menu_items',
+ 'upload_space_check_disabled', 'blog_upload_space', 'upload_filetypes', 'site_name',
+ 'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author',
+ 'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'global_terms_enabled',
+ 'illegal_names', 'limited_email_domains', 'banned_email_domains', 'WPLANG', 'admin_email',
+ );
+
foreach ( $options as $option_name ) {
if ( ! isset($_POST[$option_name]) )
continue;
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/network/site-info.php /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/network/site-info.php
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/network/site-info.php 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/network/site-info.php 2012-08-03 12:51:42.000000000 -0500
***************
*** 135,144 ****
path ) ?>home as well.' ); ?>
path ) ?>home as well.' ); ?>
--- 130,136 ----
domain . $current_site->path ?><?php _e( 'WordPress › Confirm your action' ); ?>
+
+ <?php _e( 'WordPress › Confirm your action' ); ?>
!
!
!
!
!
! ";
foreach ( (array) $blogs as $details ) {
! $siteurl = get_blog_option( $details['blog_id'], 'siteurl' );
echo "$siteurl ";
! $response = wp_remote_get( trailingslashit( $siteurl ) . "wp-admin/upgrade.php?step=upgrade_db", array( 'timeout' => 120, 'httpversion' => '1.1' ) );
if ( is_wp_error( $response ) )
wp_die( sprintf( __( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s ' ), $siteurl, $response->get_error_message() ) );
do_action( 'after_mu_upgrade', $response );
--- 60,71 ----
}
echo "";
foreach ( (array) $blogs as $details ) {
! switch_to_blog( $details['blog_id'] );
! $siteurl = site_url();
! $upgrade_url = admin_url( 'upgrade.php?step=upgrade_db' );
! restore_current_blog();
echo "$siteurl ";
! $response = wp_remote_get( $upgrade_url, array( 'timeout' => 120, 'httpversion' => '1.1' ) );
if ( is_wp_error( $response ) )
wp_die( sprintf( __( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s ' ), $siteurl, $response->get_error_message() ) );
do_action( 'after_mu_upgrade', $response );
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/network/users.php /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/network/users.php
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/network/users.php 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/network/users.php 2012-08-13 11:18:42.000000000 -0500
***************
*** 24,30 ****
screen_icon();
?>
' . __('ERROR:') . ' ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '
' . __('Warning!') . ' ' . __( 'Networks may not be fully compatible with custom wp-content directories.' ) . '
' . __('Warning!') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '
';
+
$is_www = ( 0 === strpos( $hostname, 'www.' ) );
if ( $is_www ) :
?>
***************
*** 314,324 ****
* @since 3.0.0
*/
function network_step2( $errors = false ) {
! global $base, $wpdb;
! $hostname = get_clean_basedomain();
! if ( ! isset( $base ) )
! $base = trailingslashit( stripslashes( dirname( dirname( $_SERVER['SCRIPT_NAME'] ) ) ) );
// Wildcard DNS message.
if ( is_wp_error( $errors ) )
--- 307,326 ----
* @since 3.0.0
*/
function network_step2( $errors = false ) {
! global $wpdb;
! $hostname = get_clean_basedomain();
! $slashed_home = trailingslashit( get_option( 'home' ) );
! $base = parse_url( $slashed_home, PHP_URL_PATH );
! $wp_dir_from_root = preg_replace( '#^' . preg_quote( $_SERVER['DOCUMENT_ROOT'], '#' ) . '#', '', ABSPATH );
! $wp_siteurl_subdir = trailingslashit( '/' . preg_replace( '#^' . preg_quote( $base, '#' ) . '#', '', $wp_dir_from_root ) );
! $rewrite_base = ! empty( $wp_siteurl_subdir ) ? ltrim( trailingslashit( $wp_siteurl_subdir ), '/' ) : '';
!
! $home_path = get_home_path();
!
! $location_of_wp_config = ABSPATH;
! if ( ! file_exists( ABSPATH . 'wp-config.php' ) && file_exists( dirname( ABSPATH ) . '/wp-config.php' ) )
! $location_of_wp_config = trailingslashit( dirname( ABSPATH ) );
// Wildcard DNS message.
if ( is_wp_error( $errors ) )
***************
*** 344,357 ****
}
}
if ( $_POST || ! is_multisite() ) {
?>
Caution: We recommend you back up your existing wp-config.php and %s files.' ), '.htaccess' );
! elseif ( file_exists( ABSPATH . 'web.config' ) )
printf( __( 'Caution: We recommend you back up your existing wp-config.php and %s files.' ), 'web.config' );
else
_e( 'Caution: We recommend you back up your existing wp-config.php file.' );
--- 346,363 ----
}
}
+ $subdir_match = $subdomain_install ? '' : '([_0-9a-zA-Z-]+/)?';
+ $subdir_replacement_01 = $subdomain_install ? '' : '$1';
+ $subdir_replacement_12 = $subdomain_install ? '$1' : '$2';
+
if ( $_POST || ! is_multisite() ) {
?>
Caution: We recommend you back up your existing wp-config.php and %s files.' ), '.htaccess' );
! elseif ( file_exists( $home_path . 'web.config' ) )
printf( __( 'Caution: We recommend you back up your existing wp-config.php and %s files.' ), 'web.config' );
else
_e( 'Caution: We recommend you back up your existing wp-config.php file.' );
***************
*** 360,379 ****
}
?>
! blogs.dir directory at %s/blogs.dir. This directory is used to store uploaded media for your additional sites and must be writeable by the web server.' ), WP_CONTENT_DIR );
! if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' )
! echo ' ' . __('Warning:') . ' ' . __( 'Networks may not be fully compatible with custom wp-content directories.' ) . ' ';
! ?>
wp-config.php file in %s above the line reading /* That’s all, stop editing! Happy blogging. */:' ), ABSPATH ); ?>
!
'', 'SECURE_AUTH_KEY' => '', 'LOGGED_IN_KEY' => '', 'NONCE_KEY' => '', 'AUTH_SALT' => '', 'SECURE_AUTH_SALT' => '', 'LOGGED_IN_SALT' => '', 'NONCE_SALT' => '' );
foreach ( $keys_salts as $c => $v ) {
--- 366,380 ----
}
?>
! wp-config.php file in %s above the line reading /* That’s all, stop editing! Happy blogging. */:' ), $location_of_wp_config ); ?>
!
'', 'SECURE_AUTH_KEY' => '', 'LOGGED_IN_KEY' => '', 'NONCE_KEY' => '', 'AUTH_SALT' => '', 'SECURE_AUTH_SALT' => '', 'LOGGED_IN_SALT' => '', 'NONCE_SALT' => '' );
foreach ( $keys_salts as $c => $v ) {
***************
*** 404,413 ****
--- 406,418 ----
***************
*** 415,424 ****
!
';
! if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
! $web_config_file .= '
!
! ';
! }
! $web_config_file .= '
!
!
!
!
!
! ';
! } else {
! $web_config_file =
! '
!
!
!
!
!
!
!
!
!
!
!
!
!
!
!
-
-
! ';
! }
?>
! web.config file in %s, replacing other WordPress rules:' ), ABSPATH ); ?>
!
!
.htaccess file in %s, replacing other WordPress rules:' ), ABSPATH ); ?>
!
--- 442,505 ----
!
!
!
! EOF;
!
?>
!
web.config file in %s, replacing other WordPress rules:' ), $home_path ); ?>
! ' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . ' ';
! ?>
!
!
.htaccess file in %s, replacing other WordPress rules:' ), $home_path ); ?>
! ' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . ' ';
! ?>
!
***************
*** 525,538 ****
if ( $_POST ) {
- $base = trailingslashit( stripslashes( dirname( dirname( $_SERVER['SCRIPT_NAME'] ) ) ) );
-
check_admin_referer( 'install-network-1' );
require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
// create network tables
install_network();
! $hostname = get_clean_basedomain();
$subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false;
if ( ! network_domain_check() ) {
$result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), stripslashes( $_POST['sitename'] ), $base, $subdomain_install );
--- 513,524 ----
if ( $_POST ) {
check_admin_referer( 'install-network-1' );
require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
// create network tables
install_network();
! $base = parse_url( trailingslashit( get_option( 'home' ) ), PHP_URL_PATH );
$subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false;
if ( ! network_domain_check() ) {
$result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), stripslashes( $_POST['sitename'] ), $base, $subdomain_install );
diff -crBPN --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=advanced-cache.php --exclude=wp-cache-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.pl /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/options-discussion.php /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/options-discussion.php
*** /home/packages/code/qi/SOURCES/wordpress-3.4.2/wp-admin/options-discussion.php 2012-12-17 14:37:12.000000000 -0600
--- /home/packages/code/qi/SOURCES/wordpress-3.5/wp-admin/options-discussion.php 2012-09-26 01:44:26.000000000 -0500
***************
*** 71,77 ****
/>
! '); ?>
/>
--- 71,78 ----
/>
! '); ?>
!
/>
***************
*** 79,85 ****
$maxdeep = (int) apply_filters( 'thread_comments_depth_max', 10 );
! $thread_comments_depth = ' 
! 
 ); ?>){kind=logo}