Changeset 530

Timestamp:

08/30/08 21:52:54 (3 months ago)

Author:

jf.hovinne

Message:

Removed SAPI, planned for 0.6

Files:

• trunk/src/wymeditor/jquery.wymeditor.explorer.js (modified) (2 diffs)
• trunk/src/wymeditor/jquery.wymeditor.js (modified) (5 diffs)
• trunk/src/wymeditor/jquery.wymeditor.mozilla.js (modified) (2 diffs)
• trunk/src/wymeditor/jquery.wymeditor.opera.js (modified) (2 diffs)
• trunk/src/wymeditor/jquery.wymeditor.safari.js (modified) (2 diffs)

trunk/src/wymeditor/jquery.wymeditor.explorer.js

@@ -76 +76 @@
-      this._wym.bindEvents();
-      
-      // NOTE v.mische this part will be changed on event-hacking
-      jQuery(this._doc).bind("keydown", this.handleKeydown);
-      
-      //post-init functions
-      if(jQuery.isFunction(this._options.postInit)) this._options.postInit(this);
@@ -150 +147 @@
-};
-
-WYMeditor.WymClassExplorer.prototype.handleKeydown = function(evt) {
-  
-  //'this' is the doc
-  var wym = WYMeditor.INSTANCES[this.title];
-  
-  // "start" Selection API
-  var sel = wym.selection.getSelection();
-
-/*
-    // some small tests for the Selection API
-    var containers = WYMeditor.MAIN_CONTAINERS.join(",");
-    if (sel.isAtStart(containers))
-        alert("isAtStart: "+sel.startNode.parentNode.nodeName);
-    if (sel.isAtEnd(containers))
-        alert("isAtEnd: "+sel.endNode.parentNode.nodeName);
-    if (evt.keyCode==WYMeditor.KEY.DELETE) {
-        // if deleteIfExpanded wouldn't work, no selected text would be
-        // deleted if you press del-key
-        if (sel.deleteIfExpanded())
-            return false;
-    }
-    if (evt.keyCode==WYMeditor.KEY.HOME) {
-        // if cursorToStart won't work, the cursor won't be set to start
-        // if you press home-key
-        sel.cursorToStart(sel.container);
-        return false;
-    }
-    if (evt.keyCode==WYMeditor.KEY.END)
-    {
-        // if cursorToEnd won't work, the cursor won't be set to the end
-        // if you press end-key
-        sel.cursorToEnd(sel.container);
-        return false;
-    }
-*/
-};
-
-/********** SELECTION API **********/
-/*
-Class: WymSelExplorer
-    Implementation of the Selection API for Microsoft Internet Explorer
-
-Properties:
-    original    - (object) Selection Object
-    isCollapsed - (boolean) True if selection is collapsed to single position
-    startNode   - (DOM node) Node where the selection starts
-    startOffset - (integer) Offset of the position in startNode
-    endNode     - (DOM node) Node where the selection ends
-    endOffset   - (integer) Offset of the position in endNode
-    container   - (DOM node) Node which includes the whole selection
-
-Example:
-    "|" marks the start and the end of the selection.
-    (start code)
-    <p>A <b>sm|all</b> examp|le.</p>
-    (end code)
-
-    isCollapsed - false
-    startNode   - "small"
-    startOffset - 2
-    endNode     - " example"
-    endOffset   - 6
-    container   - <p>...</p>
-*/
-WYMeditor.WymSelExplorer = function(wym) {
-    this._wym = wym;
-};
-
-WYMeditor.WymSelExplorer.prototype = {
-    /*
-    Property: getSelection
-        Return a Selection API object
-
-    Example:
-        (start code)
-        var sel = wym.selection.getSelection();
-        (end code)
-
-    Returns:
-        (object) Selection API object
-    */
-    getSelection: function() {
-        var sel = this._wym._iframe.contentWindow.document.selection;
-        var range = sel.createRange();
-
-        this.original = sel;
-
-        if (sel.type == "None")
-            this.isCollapsed = true;
-        else
-            this.isCollapsed = false;
-
-        // get start of the selection (resp. cursor position if collapsed)
-        var selStart = this._getNodeAndOffset(range.duplicate(), true);
-        this.startNode = selStart.node;
-        this.startOffset = selStart.offset;
-
-        if (this.isCollapsed) {
-            this.endNode = this.startNode;
-            this.endOffset = this.startOffset;
-        }
-        else {
-            var selEnd = this._getNodeAndOffset(range.duplicate(), false);
-            this.endNode = selEnd.node;
-            this.endOffset = selEnd.offset;
-        }
-
-        this.container = jQuery(range.parentElement()).parentsOrSelf(
-                WYMeditor.MAIN_CONTAINERS.join(","))[0];
-
-        return this;
-    },
-
-
-    _getNodeAndOffset: function(range, collapseToStart) {
-        var parentElement = range.parentElement();
-
-        // range from the beginning of parentElement to cursor position
-        var parentRange = range.duplicate();
-
-        // length of parentElement's text
-        var parentLength;
-
-        // offset from the beginning of parentElements to the cursor position
-        var parentOffset = 0;
-
-        // offset of the position to its node
-        var offset = 0;
-
-        // collapse to start or end
-        range.collapse(collapseToStart);
-        // select parent node and set range from the beginning of that node to
-        // the cursor position
-        parentRange.moveToElementText(parentElement);
-        parentLength = parentRange.text.length;
-        // XXX v.mische fix it
-        var backwardRange = parentRange.duplicate();
-        var searchRange = parentRange.duplicate();
-
-
-        parentRange.setEndPoint("EndToStart", range);
-        parentOffset = parentRange.text.length;
-
-        // direction to search
-        //  1 = forward
-        // -1 = backward
-        var direction = 1;
-
-        // where to start to find the position
-        var childPosition = 0;
-
-        // ratio of the cursor position to the total parentElement text length
-        var offsetRatio = parentOffset/parentLength;
-
-        // offset from start (if search direction==-1: end) to the child node
-        // we are currently at while searching the position
-        // finally: position of the cursor within its node
-        var offset = 0;
-
-        var childNodes = parentElement.childNodes;
-
-        // try to find a better start position for searching
-        //if (childNodes.length>20 && offsetRatio>0.1) {
-        if (childNodes.length>20 && offsetRatio>0.1) {
-            // range around the appropriate node 
-            var childRange = searchRange.duplicate();
-            // length from start to the beginning of a node near the node
-            // of the position we are looking for
-            //var childOffsetRange = parentRange.duplicate();
-
-            childPosition = Math.round(offsetRatio * childNodes.length-1);
-
-            if (childPosition <= 0)
-                childPosition = 1;
-
-            // moveToElementText doesn't work with text nodes
-            while ((childNodes[childPosition].nodeType == WYMeditor.NODE.TEXT
-                    || childNodes[childPosition].nodeName == "BR")
-                    && childPosition > 0) {
-                childPosition--;
-            }
-
-            if (childPosition > 0) {
-                childRange.moveToElementText(childNodes[childPosition]);
-                // Range from start of parent node to the start of the proposed
-                // child node
-                childRange.setEndPoint("EndToStart", searchRange);
-
-                // search forward
-                if (parentOffset > childRange.text.length) {
-                    direction = 1;
-                    searchRange.setEndPoint("StartToEnd", childRange);
-                    searchRange.setEndPoint("EndToEnd", parentRange);
-                }
-                // search backwards
-                else {
-                    direction = -1;
-                    searchRange.setEndPoint("StartToEnd", parentRange);
-                    searchRange.setEndPoint("EndToEnd", childRange);
-
-                    // caused by ranges
-                    childPosition--;
-                }
-
-            }
-            // start at the beginning
-            else {
-                direction = 1;
-                searchRange = parentRange.duplicate();
-            }
-        }
-        else {
-            if (direction == 1)
-                searchRange = parentRange.duplicate();
-            else {
-                searchRange = backwardRange.duplicate();
-                searchRange.setEndPoint("StartToEnd", parentRange);
-            }
-        }
-
-        var node=parentElement.childNodes[childPosition];
-
-
-        var currentOffsetRange = searchRange.duplicate();
-        if (direction==1) {
-            // text length of the current node
-            var nodeLength = 0;
-            var br = 0;
-
-            while (node) {
-                if (node.nodeName == 'BR')
-                    br++;
-                nodeLength = this._getTextLength(node);
-                if (currentOffsetRange.text.length > nodeLength) {
-                    currentOffsetRange.moveStart('character', nodeLength + br);
-                    br = 0;
-                }
-                else
-                    break;
-
-                node = node.nextSibling;
-            }
-            offset = currentOffsetRange.text.length;
-        }
-        // go backwards
-        else {
-            var nodeLength = 0;
-            var br = 0;
-
-            while (node) {
-                if (node.nodeName == 'BR')
-                    br++;
-                nodeLength = this._getTextLength(node);
-
-                if (currentOffsetRange.text.length > nodeLength) {
-                    var length = currentOffsetRange.text.length;
-                    currentOffsetRange.moveEnd('character', -(nodeLength+br));
-                    // NOTE v.mische Sometimes the range isn't move as far as
-                    // expected. I don't know whenwhy it happens, but it does
-                    if (br == 0) {
-                        var diff = (length-nodeLength) - currentOffsetRange.text.length;
-                        currentOffsetRange.moveEnd('character', diff);
-                    }
-                    br = 0;
-                }
-                else
-                    break;
-
-                if (node.previousSibling)
-                    node = node.previousSibling;
-                else
-                    break;
-            }
-
-            offset = nodeLength - currentOffsetRange.text.length;
-        }
-
-        return {'node': node, 'offset': offset};
-    },
-
-    /*
-    Property: _getTextLength
-        Get the length of the text of a DOM node.
-
-    Arguments:
-        node - (DOM node) [required] The node you what to know the length of.
-
-    Example:
-        (start code)
-        var node = document.createTextNode("foo");
-        _getTextLength(node) // returns 3
-        (end code)
-
-    Returns:
-        (int) Length of a DOM node.
-    */
-    _getTextLength: function(node) {
-        if (node.nodeType == WYMeditor.NODE.ELEMENT)
-            return node.innerText.length;
-        else if (node.nodeType == WYMeditor.NODE.TEXT)
-            return node.data.length;
-    },
-
-    /*
-    Property: deleteIfExpanded
-        Delete contents of a selection
-
-    Example:
-        (start code)
-        var sel = wym.selection.getSelection();
-        sel.deleteIfExpanded();
-        (end code)
-
-    Returns:
-        (boolean) True if it was expanded and thus deleted
-    */
-    deleteIfExpanded: function() {
-        if(!this.isCollapsed) {
-            this.original.clear();
-            return true;
-        }
-        return false;
-    }
-};
-

trunk/src/wymeditor/jquery.wymeditor.js

@@ -104 +104 @@
-*/
-
-1
+2
-    INSTANCES           : [],
-    STRINGS             : [],
@@ -270 +270 @@
-        this._options.jQueryPath = this._options.jQueryPath
-        || this.computeJqueryPath();
-
-        //instanciate a WYMeditor Selection API class
-        this.selection = new WYMeditor.WymSelection();
-
-        //initialize the editor instance
@@ -688 +685 @@
-  if (jQuery.browser.msie) {
-    var WymClass = new WYMeditor.WymClassExplorer(this);
-    var WymSel   = new WYMeditor.WymSelExplorer(this);
-  }
-  else if (jQuery.browser.mozilla) {
-    var WymClass = new WYMeditor.WymClassMozilla(this);
-    var WymSel   = new WYMeditor.WymSelMozilla(this);
-  }
-  else if (jQuery.browser.opera) {
-    var WymClass = new WYMeditor.WymClassOpera(this);
-    var WymSel   = new WYMeditor.WymSelOpera(this);
-  }
-  else if (jQuery.browser.safari) {
-    var WymClass = new WYMeditor.WymClassSafari(this);
-    var WymSel   = new WYMeditor.WymSelSafari(this);
-  }
-  
@@ -810 +803 @@
-      this.loadSkin();
-      
-    }
-    
-    if(WymSel) {
-    
-      //extend the selection object
-      //don't use jQuery.extend since 1.1.4
-      //jQuery.extend(this.selection, WymSel);
-      for (prop in WymSel) { this.selection[prop] = WymSel[prop]; }
-    }
-};
@@ -1521 +1506 @@
-    wym._options.postInitDialog(wym,window);
-
-};
-
-
-
-/********** SELECTION API **********/
-
-WYMeditor.WymSelection = function() {
-    this.test = "test from WymSelection";
-};
-
-
-WYMeditor.WymSelection.prototype = {
-    /* The following properties are set in the browser specific file (in
-     * getSelection()):
-     * this.original
-     * this.startNode
-     * this.endNode
-     * this.startOffset
-     * this.endOffset
-     * this.iscollapsed
-     * this.container
-     */
-
-    /* The following methods are implemented in browser specific file:
-     *  - deleteIfExpanded()
-     *  - cursorToStart()
-     *  - cursorToEnd()
-     */
-
-
-    isAtStart: function(jqexpr) {
-        var parent = jQuery(this.startNode).parentsOrSelf(jqexpr);
-
-        // jqexpr isn't a parent of the current cursor position
-        if (parent.length==0)
-            return false;
-
-        var startNode = this.startNode;
-        if (startNode.nodeType == WYMeditor.NODE.TEXT) {
-            // 1. startNode ist first child
-            // 2. offset needs to be 0 to be at the start (or the previous
-            //    characters are whitespaces)
-            if ((startNode.previousSibling
-                    && !WYMeditor.isPhantomNode(startNode.previousSibling))
-                        || (this.startOffset != 0 && !WYMeditor.isPhantomString(
-                            startNode.data.substring(0, this.startOffset))))
-                return false;
-            else
-                startNode = startNode.parentNode;
-        }
-        // cursor can be at the start of a text node and have a startOffset > 0
-        // (if the node contains trailign whitespaces)
-        else if (this.startOffset != 0)
-            return false;
-
-
-        for (var n=jQuery(startNode); n[0]!=parent[0]; n=n.parent()) {
-            var firstChild = n.parent().children(':first');
-
-            // node isn't first child => cursor can't be at the beginning
-            if (firstChild[0] != n[0]
-                    || (firstChild[0].previousSibling
-                        && !WYMeditor.isPhantomNode(firstChild[0].previousSibling)))
-                return false;
-        }
-
-        return true;
-    },
-
-    isAtEnd: function(jqexpr) {
-        var parent = jQuery(this.endNode).parentsOrSelf(jqexpr);
-
-        // jqexpr isn't a parent of the current cursor position
-        if (parent.length==0)
-            return false;
-        else
-            parent = parent[0];
-
-
-        // This is the case if, e.g ("|" = cursor): <p>textnode|<br/></p>,
-        // there the offset of endNode (endOffset) is 1 (behind the first node
-        // of <p>)
-        if (this.endNode == parent) {
-            // NOTE I don't know if it is a good idea to delete the <br>
-            // here, as "atEnd()" probably shouldn't change the dom tree,
-            // but only searching it
-            if (this.endNode.lastChild.nodeName == "BR")
-                this.endNode.removeChild(endNode.lastChild);
-
-            // if cursor is really at the end
-            if (this.endOffset == 0)
-                return false;
-            else {
-                for (var nNext=this.endNode.childNodes[this.endOffset-1].nextSibling;
-                        nNext==null || nNext.nodeName == "BR";
-                        nNext=nNext.nextSibling)
-
-                if (nNext==null)
-                    return true;
-            }
-
-        }
-        else {
-            var endNode = this.endNode;
-            if (endNode.nodeType == WYMeditor.NODE.TEXT) {
-                if ((endNode.nextSibling
-                        && !WYMeditor.isPhantomNode(endNode.nextSibling))
-                            || (this.endOffset != endNode.data.length))
-                    return false;
-                else
-                    endNode = endNode.parentNode;
-            }
-
-            for (var n=endNode; n!=parent; n=n.parentNode) {
-                var lastChild = n.parentNode.lastChild;
-                // node isn't last child => cursor can't be at the end
-                // (is this true?) in gecko there the last child could be a
-                //     phantom node
-
-                // sometimes also whitespacenodes which aren't phatom nodes
-                // get stripped, but this is ok, as this is a wysiwym editor
-                if ((lastChild != n) ||
-                        (WYMeditor.isPhantomNode(lastChild)
-                        && lastChild.previousSibling != n)) {
-                    return false;
-                }
-            }
-        }
-
-        if (this.endOffset == this.endNode.length)
-            return true;
-        else
-            return false;
-    }
-};
-

trunk/src/wymeditor/jquery.wymeditor.mozilla.js

@@ -166 +166 @@
-  var wym = WYMeditor.INSTANCES[this.title];
-  
-  // "start" Selection API
-  var sel = wym.selection.getSelection();
-
-/*
-    // some small tests for the Selection API
-    var containers = WYMeditor.MAIN_CONTAINERS.join(",");
-    if (sel.isAtStart(containers))
-        alert("isAtStart: "+sel.startNode.parentNode.nodeName);
-    if (sel.isAtEnd(containers))
-        alert("isAtEnd: "+sel.endNode.parentNode.nodeName);
-    if (evt.keyCode==WYMeditor.KEY.DELETE) {
-        // if deleteIfExpanded wouldn't work, no selected text would be
-        // deleted if you press del-key
-        if (sel.deleteIfExpanded())
-            return false;
-    }
-    if (evt.keyCode==WYMeditor.KEY.HOME) {
-        // if cursorToStart won't work, the cursor won't be set to start
-        // if you press home-key
-        sel.cursorToStart(sel.container);
-        return false;
-    }
-    if (evt.keyCode==WYMeditor.KEY.END)
-    {
-        // if cursorToEnd won't work, the cursor won't be set to the end
-        // if you press end-key
-        sel.cursorToEnd(sel.container);
-        return false;
-    }
-*/
-  
-  if(evt.ctrlKey){
-    if(evt.keyCode == 66){
@@ -308 +277 @@
-};
-
-/********** SELECTION API **********/
-
-WYMeditor.WymSelMozilla = function(wym) {
-    this._wym = wym;
-};
-
-WYMeditor.WymSelMozilla.prototype = {
-    getSelection: function() {
-        var _sel = this._wym._iframe.contentWindow.getSelection();
-        // NOTE v.mische can startNode/endNote be phantom nodes?
-        this.startNode = _sel.getRangeAt(0).startContainer;
-        this.endNode = _sel.getRangeAt(0).endContainer;
-        this.startOffset = _sel.getRangeAt(0).startOffset;
-        this.endOffset = _sel.getRangeAt(0).endOffset;
-        this.isCollapsed = _sel.isCollapsed;
-        this.original = _sel;
-        this.container = jQuery(this.startNode).parentsOrSelf(
-                WYMeditor.MAIN_CONTAINERS.join(","))[0];
-
-        return this;
-    },
-
-    cursorToStart: function(jqexpr) {
-        if (jqexpr.nodeType == WYMeditor.NODE.TEXT)
-            jqexpr = jqexpr.parentNode;
-
-        var firstTextNode = jQuery(jqexpr)[0];
-
-        while (firstTextNode.nodeType!=WYMeditor.NODE.TEXT) {
-            if (!firstTextNode.hasChildNodes())
-                break;
-            firstTextNode = firstTextNode.firstChild;
-        }
-
-        if (WYMeditor.isPhantomNode(firstTextNode))
-            firstTextNode = firstTextNode.nextSibling;
-
-        // e.g. an <img/>
-        if (firstTextNode.nodeType == WYMeditor.NODE.ELEMENT)
-            this.original.collapse(firstTextNode.parentNode, 0);
-        else
-            this.original.collapse(firstTextNode, 0);
-    },
-
-    cursorToEnd: function(jqexpr) {
-        if (jqexpr.nodeType == WYMeditor.NODE.TEXT)
-            jqexpr = jqexpr.parentNode;
-
-        var lastTextNode = jQuery(jqexpr)[0];
-
-        while (lastTextNode.nodeType!=WYMeditor.NODE.TEXT) {
-            if (!lastTextNode.hasChildNodes())
-                break;
-            lastTextNode = lastTextNode.lastChild;
-        }
-
-        if (WYMeditor.isPhantomNode(lastTextNode))
-            lastTextNode = lastTextNode.previousSibling;
-
-        // e.g. an <img/>
-        if (lastTextNode.nodeType == WYMeditor.NODE.ELEMENT)
-            this.original.collapse(lastTextNode.parentNode,
-                lastTextNode.parentNode.childNodes.length);
-        else
-            this.original.collapse(lastTextNode, lastTextNode.length);
-    },
-
-    deleteIfExpanded: function() {
-        if(!this.original.isCollapsed) {
-            this.original.deleteFromDocument();
-            return true;
-        }
-        return false;
-    }
-};
-
-

trunk/src/wymeditor/jquery.wymeditor.opera.js

@@ -107 +107 @@
-  //'this' is the doc
-  var wym = WYMeditor.INSTANCES[this.title];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-  //Get a P instead of no container
-
+
+
-      && evt.keyCode != WYMeditor.KEY.ENTER
-      && evt.keyCode != WYMeditor.KEY.LEFT
@@ -166 +137 @@
-};
-
-/********** SELECTION API **********/
-
-WYMeditor.WymSelOpera = function(wym) {
-    this._wym = wym;
-};
-
-WYMeditor.WymSelOpera.prototype = {
-    getSelection: function() {
-        var _sel = this._wym._iframe.contentWindow.getSelection();
-        // NOTE v.mische can startNode/endNote be phantom nodes?
-        this.startNode = _sel.getRangeAt(0).startContainer;
-        this.endNode = _sel.getRangeAt(0).endContainer;
-        this.startOffset = _sel.getRangeAt(0).startOffset;
-        this.endOffset = _sel.getRangeAt(0).endOffset;
-        this.isCollapsed = _sel.isCollapsed;
-        this.original = _sel;
-        this.container = jQuery(this.startNode).parentsOrSelf(
-                WYMeditor.MAIN_CONTAINERS.join(","))[0];
-
-        return this;
-    },
-
-    cursorToStart: function(jqexpr) {
-        if (jqexpr.nodeType == WYMeditor.NODE.TEXT)
-            jqexpr = jqexpr.parentNode;
-
-        var firstTextNode = jQuery(jqexpr)[0];
-
-        while (firstTextNode.nodeType!=WYMeditor.NODE.TEXT) {
-            if (!firstTextNode.hasChildNodes())
-                break;
-            firstTextNode = firstTextNode.firstChild;
-        }
-
-        if (WYMeditor.isPhantomNode(firstTextNode))
-            firstTextNode = firstTextNode.nextSibling;
-
-        // e.g. an <img/>
-        if (firstTextNode.nodeType == WYMeditor.NODE.ELEMENT)
-            this.original.collapse(firstTextNode.parentNode, 0);
-        else
-            this.original.collapse(firstTextNode, 0);
-    },
-
-    cursorToEnd: function(jqexpr) {
-        if (jqexpr.nodeType == WYMeditor.NODE.TEXT)
-            jqexpr = jqexpr.parentNode;
-
-        var lastTextNode = jQuery(jqexpr)[0];
-
-        while (lastTextNode.nodeType!=WYMeditor.NODE.TEXT) {
-            if (!lastTextNode.hasChildNodes())
-                break;
-            lastTextNode = lastTextNode.lastChild;
-        }
-
-        if (WYMeditor.isPhantomNode(lastTextNode))
-            lastTextNode = lastTextNode.previousSibling;
-
-        // e.g. an <img/>
-        if (lastTextNode.nodeType == WYMeditor.NODE.ELEMENT)
-            this.original.collapse(lastTextNode.parentNode,
-                lastTextNode.parentNode.childNodes.length);
-        else
-            this.original.collapse(lastTextNode, lastTextNode.length);
-    },
-
-    deleteIfExpanded: function() {
-        if(!this.original.isCollapsed) {
-            this.original.deleteFromDocument();
-            return true;
-        }
-        return false;
-    }
-};
-
-

trunk/src/wymeditor/jquery.wymeditor.safari.js

@@ -146 +146 @@
-  var wym = WYMeditor.INSTANCES[this.title];
-  
-  // "start" Selection API
-  //var sel = wym.selection.getSelection();
-
-/*
-    // some small tests for the Selection API
-    var containers = WYMeditor.MAIN_CONTAINERS.join(",");
-    if (sel.isAtStart(containers))
-        alert("isAtStart: "+sel.startNode.parentNode.nodeName);
-    if (sel.isAtEnd(containers))
-        alert("isAtEnd: "+sel.endNode.parentNode.nodeName);
-    if (evt.keyCode==WYMeditor.KEY.DELETE) {
-        // if deleteIfExpanded wouldn't work, no selected text would be
-        // deleted if you press del-key
-        if (sel.deleteIfExpanded())
-            return false;
-    }
-    if (evt.keyCode==WYMeditor.KEY.HOME) {
-        // if cursorToStart won't work, the cursor won't be set to start
-        // if you press home-key
-        sel.cursorToStart(sel.container);
-        return false;
-    }
-    if (evt.keyCode==WYMeditor.KEY.END)
-    {
-        // if cursorToEnd won't work, the cursor won't be set to the end
-        // if you press end-key
-        sel.cursorToEnd(sel.container);
-        return false;
-    }
-*/
-  
-  if(evt.ctrlKey){
-    if(evt.keyCode == 66){
@@ -294 +263 @@
-};
-
-/********** SELECTION API **********/
-
-WYMeditor.WymSelSafari = function(wym) {
-    this._wym = wym;
-};
-
-WYMeditor.WymSelSafari.prototype = {
-    getSelection: function() {
-        var _sel = this._wym._iframe.contentWindow.getSelection();
-        // NOTE v.mische can startNode/endNote be phantom nodes?
-        this.startNode = _sel.getRangeAt(0).startContainer;
-        this.endNode = _sel.getRangeAt(0).endContainer;
-        this.startOffset = _sel.getRangeAt(0).startOffset;
-        this.endOffset = _sel.getRangeAt(0).endOffset;
-        this.isCollapsed = _sel.isCollapsed;
-        this.original = _sel;
-        this.container = jQuery(this.startNode).parentsOrSelf(
-                WYMeditor.MAIN_CONTAINERS.join(","))[0];
-
-        return this;
-    },
-
-    cursorToStart: function(jqexpr) {
-        if (jqexpr.nodeType == WYMeditor.NODE.TEXT)
-            jqexpr = jqexpr.parentNode;
-
-        var firstTextNode = jQuery(jqexpr)[0];
-
-        while (firstTextNode.nodeType!=WYMeditor.NODE.TEXT) {
-            if (!firstTextNode.hasChildNodes())
-                break;
-            firstTextNode = firstTextNode.firstChild;
-        }
-
-        if (WYMeditor.isPhantomNode(firstTextNode))
-            firstTextNode = firstTextNode.nextSibling;
-
-        // e.g. an <img/>
-        if (firstTextNode.nodeType == WYMeditor.NODE.ELEMENT)
-            this.original.collapse(firstTextNode.parentNode, 0);
-        else
-            this.original.collapse(firstTextNode, 0);
-    },
-
-    cursorToEnd: function(jqexpr) {
-        if (jqexpr.nodeType == WYMeditor.NODE.TEXT)
-            jqexpr = jqexpr.parentNode;
-
-        var lastTextNode = jQuery(jqexpr)[0];
-
-        while (lastTextNode.nodeType!=WYMeditor.NODE.TEXT) {
-            if (!lastTextNode.hasChildNodes())
-                break;
-            lastTextNode = lastTextNode.lastChild;
-        }
-
-        if (WYMeditor.isPhantomNode(lastTextNode))
-            lastTextNode = lastTextNode.previousSibling;
-
-        // e.g. an <img/>
-        if (lastTextNode.nodeType == WYMeditor.NODE.ELEMENT)
-            this.original.collapse(lastTextNode.parentNode,
-                lastTextNode.parentNode.childNodes.length);
-        else
-            this.original.collapse(lastTextNode, lastTextNode.length);
-    },
-
-    deleteIfExpanded: function() {
-        if(!this.original.isCollapsed) {
-            this.original.deleteFromDocument();
-            return true;
-        }
-        return false;
-    }
-};
-
-