Changeset 1042

Timestamp:

10/01/08 20:52:00 (5 years ago)

Author:

douglas

Message:

FIXED Ticket #1276 Update selectNodeContents to collapse in one direction or another, not to a specific location. Update docs to reflect this

Location:

branches/new-dialogs/modules

Files:

• Gecko/Gecko.js (modified) (2 diffs)
• InternetExplorer/InternetExplorer.js (modified) (2 diffs)
• Opera/Opera.js (modified) (2 diffs)
• WebKit/WebKit.js (modified) (2 diffs)

branches/new-dialogs/modules/Gecko/Gecko.js

@@ -589 +589 @@
  *
  * @param node DomNode 
- * @param pos  Set to a numeric position inside the node to collapse the cursor here if possible. 
- */
- 
-Xinha.prototype.selectNodeContents = function(node, pos)
+ * @param collapseToStart A boolean that, when supplied, says to collapse the selection. True collapses to the start, and false to the end.
+ */
+ 
+Xinha.prototype.selectNodeContents = function(node, collapseToStart)
 {
   this.focusEditor();
   this.forceRedraw();
   var range;
-  var collapsed = typeof pos == "undefined" ? true : false;
+  var collapsed = typeof collapseToStart == "undefined" ? true : false;
   var sel = this.getSelection();
   range = this._doc.createRange();
@@ -616 +616 @@
   sel.removeAllRanges();
   sel.addRange(range);
-  if (typeof pos != "undefined")
-  {
-    if (pos)
+  if (typeof collapseToStart != "undefined")
+  {
+    if (collapseToStart)
     {
       sel.collapse(range.startContainer, range.startOffset);

branches/new-dialogs/modules/InternetExplorer/InternetExplorer.js

@@ -576 +576 @@
  *
  * @param node DomNode 
- * @param pos  Set to a numeric position inside the node to collapse the cursor here if possible. 
- */
- 
-Xinha.prototype.selectNodeContents = function(node, pos)
+ * @param collapseToStart A boolean that, when supplied, says to collapse the selection. True collapses to the start, and false to the end.
+ */
+ 
+Xinha.prototype.selectNodeContents = function(node, collapseToStart)
 {
   this.focusEditor();
   this.forceRedraw();
   var range;
-  var collapsed = typeof pos == "undefined" ? true : false;
+  var collapsed = typeof collapseToStart == "undefined" ? true : false;
   // Tables and Images get selected as "objects" rather than the text contents
   if ( collapsed && node.tagName && node.tagName.toLowerCase().match(/table|img|input|select|textarea/) )
@@ -679 +679 @@
     {
       range.moveToElementText(node);
+    }
+  }
+  if (typeof collapseToStart != "undefined")
+  {
+    range.collapse(collapseToStart);
+    if (!collapseToStart)
+    {
+      range.moveStart('character',-1);
+      range.moveEnd('character',-1);
     }
   }

branches/new-dialogs/modules/Opera/Opera.js

@@ -576 +576 @@
  *
  * @param node DomNode 
- * @param pos  Set to a numeric position inside the node to collapse the cursor here if possible. 
- */
- 
-Xinha.prototype.selectNodeContents = function(node, pos)
+ * @param collapseToStart A boolean that, when supplied, says to collapse the selection. True collapses to the start, and false to the end.
+ */
+ 
+Xinha.prototype.selectNodeContents = function(node, collapseToStart)
 {
   this.focusEditor();
   this.forceRedraw();
   var range;
-  var collapsed = typeof pos == "undefined" ? true : false;
+  var collapsed = typeof collapseToStart == "undefined" ? true : false;
   var sel = this.getSelection();
   range = this._doc.createRange();
@@ -595 +595 @@
   {
     range.selectNodeContents(node);
-    //(collapsed) && range.collapse(pos);
   }
   sel.removeAllRanges();
   sel.addRange(range);
+  if (typeof collapseToStart != "undefined")
+  {
+    if (collapseToStart)
+    {
+      sel.collapse(range.startContainer, range.startOffset);
+    } else
+    {
+      sel.collapse(range.endContainer, range.endOffset);
+    }
+  }
 };
   

branches/new-dialogs/modules/WebKit/WebKit.js

@@ -574 +574 @@
  *
  * @param node DomNode 
- * @param pos  Set to a numeric position inside the node to collapse the cursor here if possible. 
- */
- 
-Xinha.prototype.selectNodeContents = function(node, pos)
+ * @param collapseToStart A boolean that, when supplied, says to collapse the selection. True collapses to the start, and false to the end.
+ */
+ 
+Xinha.prototype.selectNodeContents = function(node, collapseToStart)
 {
   this.focusEditor();
   this.forceRedraw();
   var range;
-  var collapsed = typeof pos == "undefined" ? true : false;
+  var collapsed = typeof collapseToStart == "undefined" ? true : false;
   var sel = this.getSelection();
   range = this._doc.createRange();
@@ -596 +596 @@
   sel.removeAllRanges();
   sel.addRange(range);
-  if (typeof pos != "undefined")
-  {
-    if (pos)
+  if (typeof collapseToStart != "undefined")
+  {
+    if (collapseToStart)
     {
       sel.collapse(range.startContainer, range.startOffset);