X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=_source%2Fplugins%2Fsmiley%2Fdialogs%2Fsmiley.js;h=2e9cd751e698aa42cfc74839b74099326f52e57b;hb=fb481ba0a7d298e3e7b9034fcb9f2afdc6e8e796;hp=7285ce5e89ee1463732edbccb1aa74737a9361e2;hpb=941b0a9ba4e673e292510d80a5a86806994b8ea6;p=ckeditor.git diff --git a/_source/plugins/smiley/dialogs/smiley.js b/_source/plugins/smiley/dialogs/smiley.js index 7285ce5..2e9cd75 100644 --- a/_source/plugins/smiley/dialogs/smiley.js +++ b/_source/plugins/smiley/dialogs/smiley.js @@ -1,13 +1,14 @@ /* -Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ CKEDITOR.dialog.add( 'smiley', function( editor ) { var config = editor.config, + lang = editor.lang.smiley, images = config.smiley_images, - columns = 8, + columns = config.smiley_columns || 8, i; /** @@ -20,9 +21,7 @@ CKEDITOR.dialog.add( 'smiley', function( editor ) var target = evt.data.getTarget(), targetName = target.getName(); - if ( targetName == 'td' ) - target = target.getChild( [ 0, 0 ] ); - else if ( targetName == 'a' ) + if ( targetName == 'a' ) target = target.getChild( 0 ); else if ( targetName != 'img' ) return; @@ -35,15 +34,18 @@ CKEDITOR.dialog.add( 'smiley', function( editor ) attributes : { src : src, - _cke_saved_src : src, + 'data-cke-saved-src' : src, title : title, - alt : title + alt : title, + width : target.$.width, + height : target.$.height } }); editor.insertElement( img ); dialog.hide(); + evt.data.preventDefault(); }; var onKeydown = CKEDITOR.tools.addFunction( function( ev, element ) @@ -52,29 +54,10 @@ CKEDITOR.dialog.add( 'smiley', function( editor ) element = new CKEDITOR.dom.element( element ); var relative, nodeToMove; - var keystroke = ev.getKeystroke(); + var keystroke = ev.getKeystroke(), + rtl = editor.lang.dir == 'rtl'; switch ( keystroke ) { - // RIGHT-ARROW - case 39 : - // relative is TD - if ( ( relative = element.getParent().getNext() ) ) - { - nodeToMove = relative.getChild( 0 ); - nodeToMove.focus(); - } - ev.preventDefault(); - break; - // LEFT-ARROW - case 37 : - // relative is TD - if ( ( relative = element.getParent().getPrevious() ) ) - { - nodeToMove = relative.getChild( 0 ); - nodeToMove.focus(); - } - ev.preventDefault(); - break; // UP-ARROW case 38 : // relative is TR @@ -102,8 +85,9 @@ CKEDITOR.dialog.add( 'smiley', function( editor ) onClick( { data: ev } ); ev.preventDefault(); break; - // TAB - case 9 : + + // RIGHT-ARROW + case rtl ? 37 : 39 : // relative is TD if ( ( relative = element.getParent().getNext() ) ) { @@ -120,8 +104,9 @@ CKEDITOR.dialog.add( 'smiley', function( editor ) ev.preventDefault(true); } break; - // SHIFT + TAB - case CKEDITOR.SHIFT + 9 : + + // LEFT-ARROW + case rtl ? 39 : 37 : // relative is TD if ( ( relative = element.getParent().getPrevious() ) ) { @@ -144,27 +129,37 @@ CKEDITOR.dialog.add( 'smiley', function( editor ) }); // Build the HTML for the smiley images table. + var labelId = CKEDITOR.tools.getNextId() + '_smiley_emtions_label'; var html = [ - '
' + - '', - '' + + '', + '' + + '' +config.smiley_descriptions[ i ] + '' + '', ' | ' ); @@ -179,23 +174,29 @@ CKEDITOR.dialog.add( 'smiley', function( editor ) html.push( '