X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fsmiley%2Fdialogs%2Fsmiley.js;h=d9628a0974a925447f7c283b2d34a282f992005f;hb=4e70ea24db840898be8cc21c950363a52a2a6aba;hp=3fe408c0b3d4d1567e136a5b8c746fde60d89661;hpb=c6e377a02b54abc07129d72b632763c727476a15;p=ckeditor.git diff --git a/_source/plugins/smiley/dialogs/smiley.js b/_source/plugins/smiley/dialogs/smiley.js index 3fe408c..d9628a0 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-2011, 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,9 +34,11 @@ 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 } }); @@ -53,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 @@ -103,6 +85,9 @@ CKEDITOR.dialog.add( 'smiley', function( editor ) onClick( { data: ev } ); ev.preventDefault(); break; + + // RIGHT-ARROW + case rtl ? 37 : 39 : // TAB case 9 : // relative is TD @@ -121,6 +106,9 @@ CKEDITOR.dialog.add( 'smiley', function( editor ) ev.preventDefault(true); } break; + + // LEFT-ARROW + case rtl ? 39 : 37 : // SHIFT + TAB case CKEDITOR.SHIFT + 9 : // relative is TD @@ -145,27 +133,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 ] + '' + '', ' | ' ); @@ -180,23 +178,29 @@ CKEDITOR.dialog.add( 'smiley', function( editor ) html.push( '