| Property changes on: branches/usability/acaifix/OptIn/SpecialOptIn.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1 | 1 | - /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php:51646 |
| /trunk/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php:56151-57234,57956,58926 |
| /trunk/phase3/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 |
| 2 | 2 | + /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php:51646 |
| /trunk/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php:56151-57234,57956,58926,58973-58974 |
| /trunk/phase3/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 |
| Property changes on: branches/usability/acaifix/CollapsibleTabs/CollapsibleTabs.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 3 | 3 | - /branches/REL1_15/phase3/extensions/UsabilityInitiative/CollapsibleTabs/CollapsibleTabs.js:51646 |
| /trunk/extensions/UsabilityInitiative/CollapsibleTabs/CollapsibleTabs.js:56151-57234,58926 |
| /trunk/extensions/UsabilityInitiative/Vector/Modules/CollapsibleTabs/CollapsibleTabs.js:58969 |
| /trunk/phase3/extensions/UsabilityInitiative/CollapsibleTabs/CollapsibleTabs.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 |
| 4 | 4 | + /branches/REL1_15/phase3/extensions/UsabilityInitiative/CollapsibleTabs/CollapsibleTabs.js:51646 |
| /trunk/extensions/UsabilityInitiative/CollapsibleTabs/CollapsibleTabs.js:56151-57234,58926,58973-58974 |
| /trunk/extensions/UsabilityInitiative/Vector/Modules/CollapsibleTabs/CollapsibleTabs.js:58969 |
| /trunk/phase3/extensions/UsabilityInitiative/CollapsibleTabs/CollapsibleTabs.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 |
| Index: branches/usability/acaifix/UsabilityInitiative.hooks.php |
| — | — | @@ -67,15 +67,15 @@ |
| 68 | 68 | array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 6 ), |
| 69 | 69 | array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 17 ), |
| 70 | 70 | array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 12 ), |
| 71 | | - array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 21 ), |
| | 71 | + array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 22 ), |
| 72 | 72 | array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 8 ), |
| 73 | 73 | array( 'src' => 'js/plugins/jquery.wikiEditor.toc.js', 'version' => 27 ), |
| 74 | 74 | ), |
| 75 | 75 | 'combined' => array( |
| 76 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 63 ), |
| | 76 | + array( 'src' => 'js/plugins.combined.js', 'version' => 64 ), |
| 77 | 77 | ), |
| 78 | 78 | 'minified' => array( |
| 79 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 63 ), |
| | 79 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 64 ), |
| 80 | 80 | ), |
| 81 | 81 | ), |
| 82 | 82 | ); |
| Property changes on: branches/usability/acaifix/EditToolbar/EditToolbar.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 83 | 83 | - /branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:51646 |
| /trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56151-57234,58926 |
| /trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js:58873,58923,58953 |
| /trunk/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 |
| 84 | 84 | + /branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:51646 |
| /trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56151-57234,58926,58973-58974 |
| /trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js:58873,58923,58953 |
| /trunk/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 |
| Index: branches/usability/acaifix/js/plugins/jquery.wikiEditor.toolbar.js |
| — | — | @@ -471,7 +471,7 @@ |
| 472 | 472 | // This is a terrible hack: IE and Safari use a 1/2/4 bitmask, |
| 473 | 473 | // but Firefox uses 0/1/2 |
| 474 | 474 | // See http://quirksmode.org/dom/w3c_events.html#miscprop |
| 475 | | - if ( e.button !== 0 || e.button & 1 == 0) { |
| | 475 | + if ( e.button !== 0 && ( e.button & 1 ) == 0) { |
| 476 | 476 | return true; |
| 477 | 477 | } |
| 478 | 478 | var $sections = $(this).data( 'context' ).$ui.find( '.sections' ); |
| Property changes on: branches/usability/acaifix/js/plugins/jquery.wikiEditor.toolbar.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 479 | 479 | - /branches/REL1_15/phase3/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js:51646 |
| /trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js:56151-57234,57443,58923,58926,58953 |
| /trunk/phase3/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 |
| 480 | 480 | + /branches/REL1_15/phase3/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js:51646 |
| /trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js:56151-57234,57443,58923,58926,58953,58973-58974 |
| /trunk/phase3/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 |
| Index: branches/usability/acaifix/js/plugins.combined.js |
| — | — | @@ -2003,7 +2003,7 @@ |
| 2004 | 2004 | // This is a terrible hack: IE and Safari use a 1/2/4 bitmask, |
| 2005 | 2005 | // but Firefox uses 0/1/2 |
| 2006 | 2006 | // See http://quirksmode.org/dom/w3c_events.html#miscprop |
| 2007 | | - if ( e.button !== 0 || e.button & 1 == 0) { |
| | 2007 | + if ( e.button !== 0 && ( e.button & 1 ) == 0) { |
| 2008 | 2008 | return true; |
| 2009 | 2009 | } |
| 2010 | 2010 | var $sections = $(this).data( 'context' ).$ui.find( '.sections' ); |
| Index: branches/usability/acaifix/js/plugins.combined.min.js |
| — | — | @@ -131,7 +131,7 @@ |
| 132 | 132 | return html;},buildRow:function(context,row){var html='<tr>';for(cell in row){html+='<td class="cell cell-'+cell+'" valign="top"><span>'+ |
| 133 | 133 | $.wikiEditor.autoMsg(row[cell],['html','text'])+'</span></td>';} |
| 134 | 134 | html+='</tr>';return html;},buildCharacter:function(character,actions){if(typeof character=='string'){character={'label':character,'action':{'type':'encapsulate','options':{'pre':character}}};}else if(0 in character&&1 in character){character={'label':character[0],'action':{'type':'encapsulate','options':{'pre':character[1]}}};} |
| 135 | | -if('action'in character&&'label'in character){actions[character.label]=character.action;return'<a rel="'+character.label+'" href="#">'+character.label+'</a>';}},buildTab:function(context,id,section){var selected=$.cookie('wikiEditor-'+context.instance+'-toolbar-section');return $('<span />').attr({'class':'tab tab-'+id,'rel':id}).append($('<a />').addClass(selected==id?'current':null).attr('href','#').text($.wikiEditor.autoMsg(section,'label')).data('context',context).bind('mouseup',function(e){$(this).blur();}).bind('mousedown',function(e){if(e.button!==0||e.button&1==0){return true;} |
| | 135 | +if('action'in character&&'label'in character){actions[character.label]=character.action;return'<a rel="'+character.label+'" href="#">'+character.label+'</a>';}},buildTab:function(context,id,section){var selected=$.cookie('wikiEditor-'+context.instance+'-toolbar-section');return $('<span />').attr({'class':'tab tab-'+id,'rel':id}).append($('<a />').addClass(selected==id?'current':null).attr('href','#').text($.wikiEditor.autoMsg(section,'label')).data('context',context).bind('mouseup',function(e){$(this).blur();}).bind('mousedown',function(e){if(e.button!==0&&(e.button&1)==0){return true;} |
| 136 | 136 | var $sections=$(this).data('context').$ui.find('.sections');var $section=$(this).data('context').$ui.find('.section-'+$(this).parent().attr('rel'));var show=$section.css('display')=='none';$previousSections=$section.parent().find('.section:visible');$previousSections.css('position','absolute');$previousSections.fadeOut('fast',function(){$(this).css('position','relative');});$(this).parent().parent().find('a').removeClass('current');$sections.css('overflow','hidden');if(show){$section.fadeIn('fast');$sections.animate({'height':$section.outerHeight()},$section.outerHeight()*2,function(){$(this).css('overflow','visible').css('height','auto');});$(this).addClass('current');}else{$sections.css('height',$section.outerHeight()).animate({'height':0},$section.outerHeight()*2,function(){$(this).css('overflow','visible');});} |
| 137 | 137 | if($.trackAction!=undefined){$.trackAction($section.attr('rel')+'.'+(show?'show':'hide'));} |
| 138 | 138 | $.cookie('wikiEditor-'+$(this).data('context').instance+'-toolbar-section',show?$section.attr('rel'):null);}).click(function(){return false;}));},buildSection:function(context,id,section){context.$textarea.trigger('wikiEditor-toolbar-buildSection-'+id,[section]);var selected=$.cookie('wikiEditor-'+context.instance+'-toolbar-section');var $section;switch(section.type){case'toolbar':var $section=$('<div />').attr({'class':'toolbar section section-'+id,'rel':id});if('groups'in section){for(group in section.groups){$section.append($.wikiEditor.modules.toolbar.fn.buildGroup(context,group,section.groups[group]));}} |
| Property changes on: branches/usability/acaifix |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 139 | 139 | - /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646 |
| /trunk/extensions/UsabilityInitiative:56151-57234,58926 |
| /trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 |
| 140 | 140 | + /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646 |
| /trunk/extensions/UsabilityInitiative:56151-57234,58926,58973-58974 |
| /trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 |