Changeset 2227 in subversion

Timestamp:

Jan 9, 2009 10:45:15 AM (4 years ago)

Author:

thomasb

Message:

Migrate splitter to jQuery

File:

• branches/devel-api/skins/default/splitter.js (modified) (10 diffs)

branches/devel-api/skins/default/splitter.js

@@ -23 +23 @@
 
     // create and position the handle for this splitter
-    this.p1pos = rcube_get_object_pos(this.p1, this.relative);
-    this.p2pos = rcube_get_object_pos(this.p2, this.relative);
+    this.p1pos = this.relative ? $(this.p1).position() : $(this.p1).offset();
+    this.p2pos = this.relative ? $(this.p2).position() : $(this.p2).offset();
     
     if (this.horizontal)
       {
-      var top = this.p1pos.y + this.p1.offsetHeight;
+      var top = this.p1pos.top + this.p1.offsetHeight;
       this.layer = new rcube_layer(this.id, {x: 0, y: top, height: 10, 
             width: '100%', vis: 1, parent: this.p1.parentNode});
@@ -34 +34 @@
     else
       {
-      var left = this.p1pos.x + this.p1.offsetWidth;
+      var left = this.p1pos.left + this.p1.offsetWidth;
       this.layer = new rcube_layer(this.id, {x: left, y: 0, width: 10, 
             height: '100%', vis: 1,  parent: this.p1.parentNode});
@@ -71 +71 @@
       {
       var lh = this.layer.height - this.offset * 2;
-      this.p1.style.height = Math.floor(this.pos - this.p1pos.y - lh / 2) + 'px';
+      this.p1.style.height = Math.floor(this.pos - this.p1pos.top - lh / 2) + 'px';
       this.p2.style.top = Math.ceil(this.pos + lh / 2) + 'px';
-      this.layer.move(this.layer.x, Math.round(this.pos - lh / 2 + 1));      
+      this.layer.move(this.layer.x, Math.round(this.pos - lh / 2 + 1));
       if (bw.ie)
-        {
+        {
         var new_height = (parseInt(this.p2.parentNode.offsetHeight) - parseInt(this.p2.style.top));
         this.p2.style.height = (new_height > 0 ? new_height : 0) +'px';
@@ -82 +82 @@
     else
       {
-      this.p1.style.width = Math.floor(this.pos - this.p1pos.x - this.layer.width / 2) + 'px';
+      this.p1.style.width = Math.floor(this.pos - this.p1pos.left - this.layer.width / 2) + 'px';
       this.p2.style.left = Math.ceil(this.pos + this.layer.width / 2) + 'px';
       this.layer.move(Math.round(this.pos - this.layer.width / 2 + 1), this.layer.y);
@@ -95 +95 @@
   this.onDragStart = function(e)
     {
-    this.p1pos = rcube_get_object_pos(this.p1, this.relative);
-    this.p2pos = rcube_get_object_pos(this.p2, this.relative);
+    this.p1pos = this.relative ? $(this.p1).position() : $(this.p1).offset();
+    this.p2pos = this.relative ? $(this.p2).position() : $(this.p2).offset();
     this.drag_active = true;
     
@@ -120 +120 @@
         // the position of each iframe when the event is received
         var s = this;
-        var id = iframes[n].id;
-        this.iframe_events[n] = function(e){ e._offset = rcube_get_object_pos(document.getElementById(id)); return s.onDrag(e); }
+        var id = '#'+iframes[n].id;
+        this.iframe_events[n] = function(e){ e._offset = $(id).offset(); return s.onDrag(e); }
 
         if (iframedoc.addEventListener)
@@ -146 +146 @@
     if (this.relative)
       {
-      var parent = rcube_get_object_pos(this.p1.parentNode);
-      pos.x -= parent.x;
-      pos.y -= parent.y;
-      }
-
-    if (this.horizontal)
-      {
-      if (((pos.y - this.layer.height * 1.5) > this.p1pos.y) && ((pos.y + this.layer.height * 1.5) < (this.p2pos.y + this.p2.offsetHeight)))
+      var parent = $(this.p1.parentNode).offset();
+      pos.x -= parent.left;
+      pos.y -= parent.top;
+      }
+
+    if (this.horizontal)
+      {
+      if (((pos.y - this.layer.height * 1.5) > this.p1pos.top) && ((pos.y + this.layer.height * 1.5) < (this.p2pos.top + this.p2.offsetHeight)))
         {
         this.pos = pos.y;
@@ -161 +161 @@
     else
       {
-      if (((pos.x - this.layer.width * 1.5) > this.p1pos.x) && ((pos.x + this.layer.width * 1.5) < (this.p2pos.x + this.p2.offsetWidth)))
+      if (((pos.x - this.layer.width * 1.5) > this.p1pos.left) && ((pos.x + this.layer.width * 1.5) < (this.p2pos.left + this.p2.offsetWidth)))
         {
         this.pos = pos.x;
@@ -168 +168 @@
       }
 
-    this.p1pos = rcube_get_object_pos(this.p1, this.relative);
-    this.p2pos = rcube_get_object_pos(this.p2, this.relative);
+    this.p1pos = this.relative ? $(this.p1).position() : $(this.p1).offset();
+    this.p2pos = this.relative ? $(this.p2).position() : $(this.p2).offset();
     return false;
     };
@@ -199 +199 @@
           if (iframedoc.removeEventListener)
             iframedoc.removeEventListener('mousemove', this.iframe_events[n], false);
-          else if (iframedoc.detachEvent)
+          else if (iframedoc.detachEvent)
             iframedoc.detachEvent('onmousemove', this.iframe_events[n]);
           else