Skip to content

Commit

Permalink
Merge pull request #314 from siebrand/11
Browse files Browse the repository at this point in the history
Various fixes suggested by static code analysis
  • Loading branch information
kartikm committed Dec 3, 2013
2 parents f92999c + f370d71 commit 17b4af0
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion examples/ced/script.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$( document ).ready( function () {
'use strict';

var ime, inputmethods, imeselector, languages, $imeSelector, $langselector;
var imeselector, languages, $imeSelector, $langselector;

$( '#ced' ).ime({ imePath: '../../' });

Expand Down
2 changes: 1 addition & 1 deletion examples/ced/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ div#ced {
border: 1px solid #CCCCCC;
border-radius: 0 0 4px 4px;
height: 250px;
langselector line-height: 1.5em;
line-height: 1.5em;
overflow: auto;
padding: 10px 5px;
text-align: left;
Expand Down
3 changes: 2 additions & 1 deletion src/jquery.ime.js
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@

/**
* Set the caret position in the div.
* @param {jQuery} element The content editable div element
* @param {jQuery} $element The content editable div element
* @param {Object} position An object with start and end properties.
* @return {Array} If the cursor could not be placed at given position, how
* many characters had to go back to place the cursor
Expand Down Expand Up @@ -662,6 +662,7 @@
/**
* Set the caret position in the div.
* @param {Element} element The content editable div element
* @param position
*/
function setDivCaretPosition( element, position ) {
var nextCharIndex,
Expand Down
2 changes: 1 addition & 1 deletion test/jquery.ime.test.fixtures.js
Original file line number Diff line number Diff line change
Expand Up @@ -2866,7 +2866,7 @@ var testFixtures = [
{ input: 'thvsd advdk hsj', output: 'فارسی شیرین است', description: 'Persian Standard keyboard - text test' },

{ input: [ [ ' ', true ] ], output: '\xa0', description: 'Persian Standard keyboard - AltGr+Space -> NBSP' },
{ input: [ [ ' ', false, true ] ], output: '\u200c', description: 'Persian Standard keyboard - Shift space is ZWNJ' },
{ input: [ [ ' ', false, true ] ], output: '\u200c', description: 'Persian Standard keyboard - Shift space is ZWNJ' }
],
inputmethod: 'fa-kbd'
}
Expand Down
1 change: 1 addition & 0 deletions test/jquery.ime.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@
} );
}

// @todo FIXME: Unused.
clusterCaretTests = [
['ക്', 0, 0],
['ക്', 1, 1],
Expand Down

0 comments on commit 17b4af0

Please sign in to comment.