| Index: branches/wmf-deployment/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
| — | — | @@ -72,7 +72,7 @@ |
| 73 | 73 | array( 'src' => 'js/plugins/jquery.namespaceSelect.js', 'version' => 1 ), |
| 74 | 74 | array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 7 ), |
| 75 | 75 | array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 27 ), |
| 76 | | - array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 118 ), |
| | 76 | + array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 119 ), |
| 77 | 77 | array( 'src' => 'js/plugins/jquery.wikiEditor.highlight.js', 'version' => 29 ), |
| 78 | 78 | array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 48 ), |
| 79 | 79 | array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 12 ), |
| — | — | @@ -82,10 +82,10 @@ |
| 83 | 83 | array( 'src' => 'js/plugins/jquery.wikiEditor.publish.js', 'version' => 2 ), |
| 84 | 84 | ), |
| 85 | 85 | 'combined' => array( |
| 86 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 238 ), |
| | 86 | + array( 'src' => 'js/plugins.combined.js', 'version' => 239 ), |
| 87 | 87 | ), |
| 88 | 88 | 'minified' => array( |
| 89 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 238 ), |
| | 89 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 239 ), |
| 90 | 90 | ), |
| 91 | 91 | ), |
| 92 | 92 | ); |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/OptIn |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 93 | 93 | - /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn:51646 |
| /trunk/extensions/UsabilityInitiative/OptIn:56207,56209,56296,56333,56355,62041,62043,62127,62139-62140,62142-62143,62145-62146,62256 |
| /trunk/phase3/extensions/UsabilityInitiative/OptIn:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816 |
| 94 | 94 | + /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn:51646 |
| /trunk/extensions/UsabilityInitiative/OptIn:56207,56209,56296,56333,56355,62041,62043,62127,62139-62140,62142-62143,62145-62146,62256,62263 |
| /trunk/phase3/extensions/UsabilityInitiative/OptIn:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816 |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 95 | 95 | - /trunk/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js:62041,62043,62127,62139,62142-62143,62145-62146,62256 |
| 96 | 96 | + /trunk/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js:62041,62043,62127,62139,62142-62143,62145-62146,62256,62263 |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 97 | 97 | - /trunk/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js:62041,62043,62127,62139,62142-62143,62145-62146,62256 |
| 98 | 98 | + /trunk/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js:62041,62043,62127,62139,62142-62143,62145-62146,62256,62263 |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js |
| — | — | @@ -1164,13 +1164,13 @@ |
| 1165 | 1165 | var t = context.fn.traverser( context.$content ); |
| 1166 | 1166 | var pos = 0, lastTextNode = null, lastTextNodeDepth = null; |
| 1167 | 1167 | while ( t ) { |
| 1168 | | - if ( t.node.nodeName != '#text' && t.node.nodeName != 'BR' && t.node.nodeName != 'P' ) { |
| | 1168 | + if ( t.node.nodeName != '#text' && t.node.nodeName != 'BR' ) { |
| 1169 | 1169 | t = t.next(); |
| 1170 | 1170 | continue; |
| 1171 | 1171 | } |
| 1172 | 1172 | var nextPos = t.node.nodeName == '#text' ? pos + t.node.nodeValue.length : pos + 1; |
| 1173 | 1173 | var nextT = t.next(); |
| 1174 | | - var leavingP = t.node.nodeName != 'P' && t.inP && nextT && ( !nextT.inP || nextT.inP != t.inP ); |
| | 1174 | + var leavingP = t.node.nodeName == '#text' && t.inP && nextT && ( !nextT.inP || nextT.inP != t.inP ); |
| 1175 | 1175 | context.offsets[pos] = { |
| 1176 | 1176 | 'node': t.node, |
| 1177 | 1177 | 'offset': 0, |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins.combined.js |
| — | — | @@ -7597,13 +7597,13 @@ |
| 7598 | 7598 | var t = context.fn.traverser( context.$content ); |
| 7599 | 7599 | var pos = 0, lastTextNode = null, lastTextNodeDepth = null; |
| 7600 | 7600 | while ( t ) { |
| 7601 | | - if ( t.node.nodeName != '#text' && t.node.nodeName != 'BR' && t.node.nodeName != 'P' ) { |
| | 7601 | + if ( t.node.nodeName != '#text' && t.node.nodeName != 'BR' ) { |
| 7602 | 7602 | t = t.next(); |
| 7603 | 7603 | continue; |
| 7604 | 7604 | } |
| 7605 | 7605 | var nextPos = t.node.nodeName == '#text' ? pos + t.node.nodeValue.length : pos + 1; |
| 7606 | 7606 | var nextT = t.next(); |
| 7607 | | - var leavingP = t.node.nodeName != 'P' && t.inP && nextT && ( !nextT.inP || nextT.inP != t.inP ); |
| | 7607 | + var leavingP = t.node.nodeName == '#text' && t.inP && nextT && ( !nextT.inP || nextT.inP != t.inP ); |
| 7608 | 7608 | context.offsets[pos] = { |
| 7609 | 7609 | 'node': t.node, |
| 7610 | 7610 | 'offset': 0, |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins.combined.min.js |
| — | — | @@ -526,8 +526,8 @@ |
| 527 | 527 | var lowerBound=-1;for(var o in context.offsets){if(o>offset){break;} |
| 528 | 528 | lowerBound=o;} |
| 529 | 529 | if(!(lowerBound in context.offsets)){return null;} |
| 530 | | -var base=context.offsets[lowerBound];return context.offsets[offset]={'node':base.node,'offset':base.offset+offset-lowerBound,'length':base.length,'depth':base.depth,'lastTextNode':base.lastTextNode,'lastTextNodeDepth':base.lastTextNodeDepth};},'purgeOffsets':function(){context.offsets=null;},'refreshOffsets':function(){context.offsets=[];var t=context.fn.traverser(context.$content);var pos=0,lastTextNode=null,lastTextNodeDepth=null;while(t){if(t.node.nodeName!='#text'&&t.node.nodeName!='BR'&&t.node.nodeName!='P'){t=t.next();continue;} |
| 531 | | -var nextPos=t.node.nodeName=='#text'?pos+t.node.nodeValue.length:pos+1;var nextT=t.next();var leavingP=t.node.nodeName!='P'&&t.inP&&nextT&&(!nextT.inP||nextT.inP!=t.inP);context.offsets[pos]={'node':t.node,'offset':0,'length':nextPos-pos+(leavingP?1:0),'depth':t.depth,'lastTextNode':lastTextNode,'lastTextNodeDepth':lastTextNodeDepth};if(leavingP){context.offsets[nextPos]={'node':t.node,'offset':nextPos-pos,'length':nextPos-pos+1,'depth':t.depth,'lastTextNode':lastTextNode,'lastTextNodeDepth':lastTextNodeDepth};} |
| | 530 | +var base=context.offsets[lowerBound];return context.offsets[offset]={'node':base.node,'offset':base.offset+offset-lowerBound,'length':base.length,'depth':base.depth,'lastTextNode':base.lastTextNode,'lastTextNodeDepth':base.lastTextNodeDepth};},'purgeOffsets':function(){context.offsets=null;},'refreshOffsets':function(){context.offsets=[];var t=context.fn.traverser(context.$content);var pos=0,lastTextNode=null,lastTextNodeDepth=null;while(t){if(t.node.nodeName!='#text'&&t.node.nodeName!='BR'){t=t.next();continue;} |
| | 531 | +var nextPos=t.node.nodeName=='#text'?pos+t.node.nodeValue.length:pos+1;var nextT=t.next();var leavingP=t.node.nodeName=='#text'&&t.inP&&nextT&&(!nextT.inP||nextT.inP!=t.inP);context.offsets[pos]={'node':t.node,'offset':0,'length':nextPos-pos+(leavingP?1:0),'depth':t.depth,'lastTextNode':lastTextNode,'lastTextNodeDepth':lastTextNodeDepth};if(leavingP){context.offsets[nextPos]={'node':t.node,'offset':nextPos-pos,'length':nextPos-pos+1,'depth':t.depth,'lastTextNode':lastTextNode,'lastTextNodeDepth':lastTextNodeDepth};} |
| 532 | 532 | pos=nextPos+(leavingP?1:0);if(t.node.nodeName=='#text'){lastTextNode=t.node;lastTextNodeDepth=t.depth;} |
| 533 | 533 | t=nextT;}},'saveSelection':function(){if(!$.browser.msie){return;} |
| 534 | 534 | context.$iframe[0].contentWindow.focus();context.savedSelection=context.$iframe[0].contentWindow.document.selection.createRange();},'restoreSelection':function(){if(!$.browser.msie||context.savedSelection===null){return;} |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 535 | 535 | - /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646 |
| /trunk/extensions/UsabilityInitiative:56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256 |
| /trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816 |
| 536 | 536 | + /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646 |
| /trunk/extensions/UsabilityInitiative:56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256,62263 |
| /trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816 |