Merge branch 'master' into view-refactor

[redakcja.git] / project / static / js / views / split.js

diff --git a/project/static/js/views/split.js b/project/static/js/views/split.js
index d8c5e6b..cc0d361 100644 (file)
--- a/project/static/js/views/split.js
+++ b/project/static/js/views/split.js
@@ -1,23 +1,26 @@
-/*globals Class*/
+/*globals View*/

 
 // Split view inspired by jQuery Splitter Plugin http://methvin.com/splitter/
 
 // Split view inspired by jQuery Splitter Plugin http://methvin.com/splitter/

-var SplitView = Class.extend({
+var SplitView = View.extend({

   splitbarClass: 'splitview-splitbar',
   activeClass: 'splitview-active',
   splitbarClass: 'splitview-splitbar',
   activeClass: 'splitview-active',

+  overlayClass: 'splitview-overlay',

   element: null,
   element: null,

+  model: null,

   zombie: null,
   leftViewOffset: 0,
   
   // Cache
   _splitbarWidth: 0,
   
   zombie: null,
   leftViewOffset: 0,
   
   // Cache
   _splitbarWidth: 0,
   

-  init: function(element) {
+  init: function(element, model) {

     this.element = $(element).css('position', 'relative');
     this.element = $(element).css('position', 'relative');

+    this.model = model;

     this.views = $(">*", this.element[0]).css({
        position: 'absolute',                     // positioned inside splitter container
        'z-index': 1,                                           // splitbar is positioned above
        '-moz-outline-style': 'none',   // don't show dotted outline
     this.views = $(">*", this.element[0]).css({
        position: 'absolute',                     // positioned inside splitter container
        'z-index': 1,                                           // splitbar is positioned above
        '-moz-outline-style': 'none',   // don't show dotted outline

-       overflow: 'auto'
+      overflow: 'auto'

     });
     
     this.leftView = $(this.views[0]);
     });
     
     this.leftView = $(this.views[0]);


@@ -44,6 +47,13 @@ var SplitView = Class.extend({
     
   beginResize: function(event) {
     this.zombie = this.zombie || this.splitbar.clone(false).insertAfter(this.leftView);
     
   beginResize: function(event) {
     this.zombie = this.zombie || this.splitbar.clone(false).insertAfter(this.leftView);

+    this.overlay = this.overlay || $('<div></div>').addClass(this.overlayClass).css({
+        position: 'absolute',
+        width: this.element.width(),
+        height: this.element.height(),
+        top: this.element.position().top,
+        left: this.element.position().left
+      }).appendTo(this.element);

     this.views.css("-webkit-user-select", "none"); // Safari selects A/B text on a move
     this.splitbar.addClass(this.activeClass);
     this.leftViewOffset = this.leftView[0].offsetWidth - event.pageX;
     this.views.css("-webkit-user-select", "none"); // Safari selects A/B text on a move
     this.splitbar.addClass(this.activeClass);
     this.leftViewOffset = this.leftView[0].offsetWidth - event.pageX;


@@ -63,6 +73,8 @@ var SplitView = Class.extend({
     var newPosition = event.pageX + this.leftViewOffset;
     this.zombie.remove();
     this.zombie = null;
     var newPosition = event.pageX + this.leftViewOffset;
     this.zombie.remove();
     this.zombie = null;

+    this.overlay.remove();
+    this.overlay = null;

     this.resplit(newPosition);
 
     $(document)
     this.resplit(newPosition);
 
     $(document)


@@ -88,6 +100,7 @@ var SplitView = Class.extend({
   
   dispose: function() {
     this.splitter.unbind('mousedown.splitview');
   
   dispose: function() {
     this.splitter.unbind('mousedown.splitview');

+    this._super();

   }
 });
 
   }
 });