Ticket #33300: 33300.2.patch
File 33300.2.patch, 6.8 KB (added by , 9 years ago) |
---|
-
src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js
12 12 */ 13 13 ( function( tinymce, setTimeout ) { 14 14 tinymce.PluginManager.add( 'wptextpattern', function( editor ) { 15 var VK = tinymce.util.VK, 16 spacePatterns = [ 17 { regExp: /^[*-]\s/, cmd: 'InsertUnorderedList' }, 18 { regExp: /^1[.)]\s/, cmd: 'InsertOrderedList' } 19 ], 20 enterPatterns = [ 21 { start: '##', format: 'h2' }, 22 { start: '###', format: 'h3' }, 23 { start: '####', format: 'h4' }, 24 { start: '#####', format: 'h5' }, 25 { start: '######', format: 'h6' }, 26 { start: '>', format: 'blockquote' } 27 ], 28 canUndo, refNode, refPattern; 15 var VK = tinymce.util.VK; 16 17 var spacePatterns = [ 18 { regExp: /^[*-]\s/, cmd: 'InsertUnorderedList' }, 19 { regExp: /^1[.)]\s/, cmd: 'InsertOrderedList' } 20 ]; 21 22 var enterPatterns = [ 23 { start: '##', format: 'h2' }, 24 { start: '###', format: 'h3' }, 25 { start: '####', format: 'h4' }, 26 { start: '#####', format: 'h5' }, 27 { start: '######', format: 'h6' }, 28 { start: '>', format: 'blockquote' } 29 ]; 30 31 var inlinePatterns = [ 32 { start: '*', end: '*', format: 'italic' }, 33 { start: '**', end: '**', format: 'bold' }, 34 { start: '_', end: '_', format: 'italic' }, 35 { start: '__', end: '__', format: 'bold' }, 36 { start: '`', end: '`', format: 'code' } 37 ]; 38 39 var canUndo; 40 var refNode; 41 var refPattern; 42 var chars = []; 43 var zeroWidthSpaceNode; 44 45 tinymce.each( inlinePatterns, function( pattern ) { 46 tinymce.each( ( pattern.start + pattern.end ).split( '' ), function( c ) { 47 if ( tinymce.inArray( chars, c ) === -1 ) { 48 chars.push( c ); 49 } 50 } ); 51 } ); 29 52 30 53 editor.on( 'selectionchange', function() { 54 var offset; 55 31 56 canUndo = null; 57 58 if ( zeroWidthSpaceNode ) { 59 offset = zeroWidthSpaceNode.data.indexOf( '\u200b' ); 60 61 if ( offset !== -1 ) { 62 zeroWidthSpaceNode.deleteData( offset, offset + 1 ); 63 } 64 } 32 65 } ); 33 66 34 67 editor.on( 'keydown', function( event ) { … … 48 81 space(); 49 82 } else if ( event.keyCode === VK.ENTER && ! VK.modifierPressed( event ) ) { 50 83 enter(); 84 } else if ( event.keyCode > 47 || ( event.keyCode >= 91 && event.keyCode <= 93 ) /* Ignore special keys. */ ) { 85 inline(); 51 86 } 52 87 } ); 53 88 89 function inline() { 90 var rng = editor.selection.getRng(); 91 var node = rng.startContainer; 92 var offset = rng.startOffset; 93 var startOffset; 94 var endOffset; 95 var pattern; 96 var format; 97 var zero; 98 99 if ( node.nodeType !== 3 || ! node.data.length || ! offset ) { 100 return; 101 } 102 103 if ( tinymce.inArray( chars, node.data.charAt( offset - 1 ) ) === -1 ) { 104 return; 105 } 106 107 function findStart( node ) { 108 var i = inlinePatterns.length; 109 var offset; 110 111 while ( i-- ) { 112 pattern = inlinePatterns[ i ]; 113 offset = node.data.indexOf( pattern.end ); 114 115 if ( offset !== -1 ) { 116 return offset; 117 } 118 } 119 } 120 121 startOffset = findStart( node ); 122 endOffset = node.data.lastIndexOf( pattern.end ); 123 124 if ( startOffset === endOffset || endOffset === -1 ) { 125 return; 126 } 127 128 if ( endOffset - startOffset <= pattern.start.length ) { 129 return; 130 } 131 132 if ( node.data.slice( startOffset + pattern.start.length, endOffset ).indexOf( pattern.start.slice( 0, 1 ) ) !== -1 ) { 133 return; 134 } 135 136 format = editor.formatter.get( pattern.format ); 137 138 if ( format && format[0].inline ) { 139 editor.undoManager.add(); 140 141 editor.undoManager.transact( function() { 142 node.insertData( offset, '\u200b' ); 143 144 node = node.splitText( startOffset ); 145 zero = node.splitText( offset - startOffset ); 146 147 node.deleteData( 0, pattern.start.length ); 148 node.deleteData( node.data.length - pattern.end.length, pattern.end.length ); 149 150 editor.formatter.apply( pattern.format, {}, node ); 151 152 editor.selection.setCursorLocation( zero, 1 ); 153 } ); 154 155 // We need to wait for native events to be triggered. 156 setTimeout( function() { 157 canUndo = 'space'; 158 zeroWidthSpaceNode = zero; 159 } ); 160 } 161 } 162 54 163 function firstTextNode( node ) { 55 164 var parent = editor.dom.getParent( node, 'p' ), 56 165 child; … … 157 266 } 158 267 159 268 function ltrim( text ) { 160 if ( text ) { 161 return text.replace( /^\s+/, '' ); 162 } 163 164 return ''; 269 return text ? text.replace( /^\s+/, '' ) : ''; 165 270 } 166 271 167 272 function enter() { -
tests/qunit/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js
14 14 '0': 48, '1': 49, '2': 50, '3': 51, '4': 52, '5': 53, '6': 54, '7': 55, '8': 56, '9': 57,'a': 65, 'b': 66, 'c': 67, 15 15 'd': 68, 'e': 69, 'f': 70, 'g': 71, 'h': 72, 'i': 73, 'j': 74, 'k': 75, 'l': 76, 'm': 77, 'n': 78, 'o': 79, 'p': 80, 'q': 81, 16 16 'r': 82, 's': 83, 't': 84, 'u': 85, 'v': 86, 'w': 87, 'x': 88, 'y': 89, ' ': 32, ',': 188, '-': 189, '.': 190, '/': 191, '\\': 220, 17 '[': 219, ']': 221, '\'': 222, ';': 186, '=': 187, ')': 41 17 '[': 219, ']': 221, '\'': 222, ';': 186, '=': 187, ')': 41, 18 '*': 48 // Anything will do. 18 19 }; 19 20 20 21 return lookup[String.fromCharCode(charCode)]; … … 277 278 assert.equal( editor.getContent(), '<p>### </p>\n<p> </p>' ); 278 279 }, assert.async() ); 279 280 } ); 281 282 QUnit.test( 'Inline: single.', function( assert ) { 283 type( '*test*', function() { 284 assert.equal( editor.getContent(), '<p><em>test</em></p>' ); 285 assert.equal( editor.selection.getRng().startOffset, 1 ); 286 }, assert.async() ); 287 } ); 288 289 QUnit.test( 'Inline: double.', function( assert ) { 290 type( '**test**', function() { 291 assert.equal( editor.getContent(), '<p><strong>test</strong></p>' ); 292 assert.equal( editor.selection.getRng().startOffset, 1 ); 293 }, assert.async() ); 294 } ); 295 296 QUnit.test( 'Inline: after typing.', function( assert ) { 297 editor.setContent( '<p>test test test</p>' ); 298 editor.selection.setCursorLocation( editor.$( 'p' )[0].firstChild, 5 ); 299 300 type( '**', function() { 301 editor.selection.setCursorLocation( editor.$( 'p' )[0].firstChild, 11 ); 302 }, '**', function() { 303 assert.equal( editor.getContent(), '<p>test <strong>test</strong> test</p>' ); 304 assert.equal( editor.selection.getRng().startOffset, 1 ); 305 }, assert.async() ); 306 } ); 307 308 QUnit.test( 'Inline: no change.', function( assert ) { 309 type( '******', function() { 310 assert.equal( editor.getContent(), '<p>******</p>' ); 311 }, assert.async() ); 312 } ); 280 313 } )( window.jQuery, window.QUnit, window.tinymce, window.setTimeout );