Changeset 14200

Timestamp:

06/28/08 08:10:00 (5 months ago)

Author:

peller

Message:

some more cleanup. Refs #7055

Files:

• dojox/trunk/string/BidiComplex.js (modified) (10 diffs)

dojox/trunk/string/BidiComplex.js

@@ -20 +20 @@
         }
 
+//FIXME: use dojo.connect
         if(dojo.isIE){
                 field.onkeydown = new Function("dojox.string.BidiComplex._ceKeyDown(event);");
@@ -28 +29 @@
         }
 
+//FIXME: use dojo.connect
         field.oncut = dojox.string.BidiComplex._fOnCut;
         field.oncopy = dojox.string.BidiComplex._fOnCopy;
@@ -35 +37 @@
         
 dojox.string.BidiComplex.createDisplayString = function(/*String*/str, /*String*/pattern){
-                // summary:
-                //              Create the Display string by adding the Unicode direction Markers 
-                // Example :
-                //              var displayString = dojox.string.BidiComplex.createDisplayString(originalString,"FILE_PATH");
-                //   
+        // summary:
+        //              Create the display string by adding the Unicode direction Markers 
+        // pattern: Complex Expression Pattern type. One of "FILE_PATH", "URL", "EMAIL", "XPATH"
+
+//FIXME: inline _insertMarkers
         return dojox.string.BidiComplex._insertMarkers(str, pattern);
 };
@@ -168 +170 @@
         }
 
-        textToClipboard = dojox.string.BidiComplex.stripSpecialCharacters(text);
+        var textToClipboard = dojox.string.BidiComplex.stripSpecialCharacters(text);
 
         if(dojo.isIE){
@@ -195 +197 @@
 
         if(dojo.isIE){
-                curPos = obj.selectionStart; 
+//              curPos = obj.selectionStart; 
                 range = document.selection.clear();
         }else{
-                curPos = obj.selectionStart;
+                var curPos = obj.selectionStart;
                 obj.value = obj.value.substring(0, curPos) + obj.value.substring(obj.selectionEnd);
                 obj.setSelectionRange(curPos, curPos);
@@ -206 +208 @@
 };
 
-dojox.string.BidiComplex._getCaretPos = function(event,obj){
-        if(!dojo.isIE){
-                return [event.target.selectionStart, event.target.selectionEnd];    
-        }else{
+// is there dijit code to do this?
+dojox.string.BidiComplex._getCaretPos = function(event, obj){
+        if(dojo.isIE){
                 var position = 0,
                         range = document.selection.createRange().duplicate(),
@@ -225 +226 @@
                         ++position;
                 }
-        }
-
-        return [position, position + rangeLength];
-};
-
+
+                return [position, position + rangeLength];
+        }
+
+        return [event.target.selectionStart, event.target.selectionEnd];
+};
+
+// is there dijit code to do this?
 dojox.string.BidiComplex._setSelectedRange = function(obj,selectionStart,selectionEnd){
         if(dojo.isIE){
@@ -295 +299 @@
 
         if(pattern == "FILE_PATH"){
-                delimiters = "/\\:.";         
+                delimiters = "/\\:."; // FIXME: use split?
                 for(i = 0; i < str.length; i++){ //FIXME: dojo.forEach
                         if((delimiters.indexOf(str.charAt(i)) >= 0) &&
                                         dojox.string.BidiComplex._isCharBeforeBiDiChar(str, i, previous)){
                                 previous = i;
-                                dojox.string.BidiComplex._segmentsPointers[sp_len] = i;
-                                sp_len++;
+                                dojox.string.BidiComplex._segmentsPointers[sp_len++] = i;
                         }
                 }
@@ -308 +311 @@
                                     
                 // parse protocol, host, path
-                delimiters = "/:.?=&#";
+                delimiters = "/:.?=&#"; // FIXME: use split?
                 for(i = 0; i < buffer_length; i++){ //FIXME: dojo.forEach
                         if((delimiters.indexOf(str.charAt(i))  >= 0)  &&
@@ -318 +321 @@
                 }               
         }else if(pattern == "EMAIL"){
-                delimiters = "<>@.,;";         
+                delimiters = "<>@.,;"; // FIXME: use split?         
                 var inQuotes = false;