Browse files

Mask: fixing some merge conflicts

  • Loading branch information...
1 parent 6209642 commit 889ce2b54486d07ec832b18e0b6045336d979dfb @gnarf gnarf committed Sep 14, 2011
Showing with 4 additions and 6 deletions.
  1. +4 −6 ui/jquery.ui.mask.js
View
10 ui/jquery.ui.mask.js
@@ -185,22 +185,20 @@ $.widget( "ui.mask", {
return;
case keyCode.LEFT:
- bufferObject = that.buffer[ position.begin ];
+ bufferObject = this.buffer[ position.begin ];
if ( bufferObject && bufferObject.length > 1 ) {
bufferObject.value = this._validValue( bufferObject, bufferObject.value );
this._paint();
event.preventDefault();
}
- position = that._seekLeft( bufferObject.start );
- if ( position < 0 ) {
- position = that._seekLeft( that.buffer.length );
- }
- bufferObject = that.buffer[ position ];
+ position = this._seekLeft( bufferObject.start );
+ bufferObject = this.buffer[ position ];
if ( bufferObject && bufferObject.length > 1 ) {
this._caret( bufferObject.start, bufferObject.start + ( bufferObject && bufferObject.length > 1 ? bufferObject.length : 0 ) );
event.preventDefault();
}
return;
+
case keyCode.RIGHT:
bufferObject = this.buffer[ position.begin ];
if ( bufferObject && bufferObject.length > 1 ) {

0 comments on commit 889ce2b

Please sign in to comment.