rsence 2.1.3 → 2.1.4

data/VERSION

@@ -1 +1 @@
-2.1.3
+2.1.4

data/js/comm/sessionwatcher/sessionwatcher.js

@@ -25,14 +25,15 @@
 COMM.SessionWatcher = HApplication.extend({
   constructor: function( _timeoutSecs, _sesTimeoutValueId ){
     
-    // onIdle is called when HSystem's ticker count % 100 == 0
-    // this means it's 5 seconds with HSystemTickerInterval 50
-    this.base(10, 'SesWatcher'); 
-    
     // gets the HValue represented by
     // sesTimeoutValueId (:client_time in server)
     this.sesTimeoutValue = COMM.Values.values[_sesTimeoutValueId];
     this.timeoutSecs = _timeoutSecs;
+    
+    // onIdle is called when HSystem's ticker count % 100 == 0
+    // this means it's 5 seconds with HSystemTickerInterval 50
+    this.base(10, 'SesWatcher'); 
+    
   },
   
   // Tells the server the client's current time

data/js/controls/button/themes/default/button.css

@@ -25,7 +25,7 @@
 }
 
 .button_edge_left {
-  left: 0px; width: 24px;
+  left: 0px; width: 6px;
   background-position: 0px 0px;
 }
 .disabled > .button_control > .button_edge_left {
@@ -39,21 +39,21 @@
 }
 
 .button_edge_right {
-  right: 0px; width: 24px;
-  background-position: -24px 0px;
+  right: 0px; width: 6px;
+  background-position: -42px 0px;
 }
 .disabled > .button_control > .button_edge_right {
-  background-position: -24px -144px;
+  background-position: -42px -144px;
 }
 .enabled > .button_control:hover > .button_edge_right {
-  background-position: -24px -48px;
+  background-position: -42px -48px;
 }
 .enabled > .button_control:active > .button_edge_right {
-  background-position: -24px -96px;
+  background-position: -42px -96px;
 }
 
 .button_center {
-  left: 24px; right: 24px;
+  left: 6px; right: 6px;
   background-position: 0px -24px;
 }
 .disabled > .button_control > .button_center {

data/js/datetime/timesheet/timesheet.js

@@ -23,6 +23,10 @@ HTimeSheet = HControl.extend({
   /* Default amount of pixels from right. Override with options when necessary. */
   itemOffsetRight: 0,
   
+  defaultEvents: {
+    draggable: true
+  },
+  
   controlDefaults: HControlDefaults.extend({
     pxPerHour: null,
     itemOffsetLeft: null,
@@ -120,9 +124,29 @@ HTimeSheet = HControl.extend({
   *
   **/
   startDrag: function(x,y){
-    this.createItem(y-this.pageY());
-    EVENT.startDragging( this.dragItem );
+    this._startDragTime = new Date().getTime();
+    this._startDragCoords = [x,y];
+    return true;
+  },
+  
+  drag: function(x,y){
+    if(((new Date().getTime()) - this._startDragTime) < 200){
+      // only create when 200 ms has elapsed to enable clicking
+      return true;
+    }
+    if(this._startDragCoords[0]!==x && this._startDragCoords[1]!==y){
+      this.createItem(this._startDragCoords[1]-this.pageY());
+      EVENT.startDragging( this.dragItem );
+      return true;
+    }
+  },
+  
+  click: function(x,y){
+    // deactivate all items
+    EVENT.changeActiveControl(this);
+    return true;
   },
+  
   listItemViews: false,
   
 /** = Description
@@ -145,10 +169,10 @@ HTimeSheet = HControl.extend({
   *
   **/
   createItemRect: function(_origY, _lineHeight){
-    var _left = this.itemOffsetLeft,
-        _top = _origY,
-        _right = this.rect.width - this.itemOffsetRight,
-        _bottom = _origY + _lineHeight;
+    var _left = this.itemOffsetLeft+1,
+        _top = _origY+1,
+        _right = this.rect.width - this.itemOffsetRight - 1,
+        _bottom = _origY + _lineHeight - 2;
     return HRect.nu( _left, _top, _right, _bottom );
   },
 
@@ -204,24 +228,61 @@ HTimeSheet = HControl.extend({
   *
   **/
   refreshValue: function(){
-    var _data = this.value, i;
+    var
+    _data = this.value,
+    i;
     if(this.listItemViews === false){
       this.listItemViews = [];
     }
-    if(this.listItemViews.length !== 0){
+    else if(this.listItemViews.length > 0){
       for( i=0; i<this.listItemViews.length; i++){
         this.listItemViews[i].die();
       }
       this.listItemViews = [];
     }
-    if(_data instanceof Array){
-      var _value, _item;
+    if(_data instanceof Array && _data.length > 0){
+      var
+      _value,
+      _item;
       for( i=0; i<_data.length; i++){
         _value = _data[i];
         _item = this.createTimeSheetItem( _value );
         this.listItemViews.push( _item );
       }
     }
+    var
+    _overlaps = [],
+    j;
+    for(i=0;i<this.listItemViews.length;i++){
+      for(j=0;j<this.listItemViews.length;j++){
+        if((i !== j) && (_overlaps.indexOf(i)===-1) && (_overlaps.indexOf(j)===-1)){
+          if(this.listItemViews[i].rect.intersects(this.listItemViews[j].rect)){
+            _overlaps.push(i);
+          }
+        }
+      }
+    }
+    var
+    _overlapCount = _overlaps.length+1,
+    _overlapLefts = {},
+    _itemWidth = ( this.rect.width - this.itemOffsetRight - this.itemOffsetLeft ),
+    _width = Math.floor( _itemWidth / _overlapCount),
+    _left = this.itemOffsetLeft;
+    for(j=0;j<_overlapCount;j++){
+      _overlapLefts[_overlaps[j]] = _left + (j*_width) + _width;
+    }
+    for(i=0;i<this.listItemViews.length;i++){
+      if(_overlaps.indexOf(i)===-1){
+        this.listItemViews[i].rect.setLeft(_left);
+      }
+      else {
+        this.listItemViews[i].rect.setLeft(_overlapLefts[i]);
+      }
+      this.listItemViews[i].rect.setWidth(_width);
+    }
+    for(i=0;i<this.listItemViews.length;i++){
+      this.listItemViews[i].drawRect();
+    }
   }
 });
 

data/js/datetime/timesheet_item/timesheet_item.js

@@ -17,12 +17,18 @@ HTimeSheetItem = HControl.extend({
   /* Which mode the component is in. When created by dragging, acts in 'create' mode, otherwise is 'normal'. Can be overridden in options. */
   dragMode: 'create',
   
-  /* The previous coordinate. Used to detect double-drag as double-click. */
+  /* The previous coordinate. Used to detect double-drag as double-click */
   prevXY: [0,0],
   
   /* The time at the previous coordinate. Used to detect double-drag as double-click. */
   prevXYTime: 0,
   
+  defaultEvents: {
+    draggable: true,
+    click: true,
+    doubleClick: true
+  },
+  
   controlDefaults: HControlDefaults.extend({
     dragMode: 'create',
     constructor: function(_ctrl){
@@ -46,12 +52,7 @@ HTimeSheetItem = HControl.extend({
           _yEquals = (Math.round(this.prevXY[1]/4) === Math.round(y/4)),
           _noTimeout = ((_timeNow - this.prevXYTime) < 500);
       if( _xEquals && _yEquals && _noTimeout ) { // doubleClick
-        if( this.parent['editor'] ){
-          var _editor = this.parent.editor;
-          _editor.setTimeSheetItem(this);
-          _editor.bringToFront();
-          _editor.show();
-        }
+        return true;
       }
       else {
         var _diffTop = this.rect.top - this.origY,
@@ -74,6 +75,17 @@ HTimeSheetItem = HControl.extend({
     return true;
   },
   
+  doubleClick: function(x,y){
+    if( this.parent['editor'] ){
+      var _editor = this.parent.editor;
+      _editor.setTimeSheetItem(this);
+      _editor.bringToFront();
+      _editor.show();
+      return true;
+    }
+    return false;
+  },
+  
 /** = Description
   * Label setter function.
   *
@@ -217,8 +229,13 @@ HTimeSheetItem = HControl.extend({
   *
   **/
   endDrag: function(x,y){
-    var _pxPerHour = Math.floor(this.parent.pxPerHour),
-        _value;
+    var
+    _pxPerHour = Math.floor(this.parent.pxPerHour),
+    _value,
+    _yEquals = (Math.round(this.prevXY[1]/4) === Math.round(y/4));
+    if(_yEquals){ // nothing moved, just return.
+      return true;
+    }
     if(this.dragMode === 'create'){
       this.parent.listItemViews.push( this );
       _value = {};
@@ -259,11 +276,11 @@ HTimeSheetItem = HControl.extend({
   },
   
   _getValueTop: function( _value ){
-    return _value.timeBegin * this.parent.pxPerHour;
+    return (_value.timeBegin * this.parent.pxPerHour)+1;
   },
   
   _getValueBottom: function( _value ){
-    return _value.timeEnd * this.parent.pxPerHour;
+    return (_value.timeEnd * this.parent.pxPerHour)-2;
   },
   
 /** = Description

data/js/foundation/application/application.js

@@ -187,10 +187,16 @@ HApplication = HClass.extend({
   * resistant. Do not extend.
   **/
   _startIdle: function(){
-    HSystem.busyApps[ this.appId ] = true;
-    this.onIdle();
-    this._pollViews();
-    HSystem.busyApps[ this.appId ] = false;
+    var _this = this;
+    HSystem.busyApps[ _this.appId ] = true;
+    this._busyTimer = setTimeout(
+      function(){
+        _this.onIdle();
+        _this._pollViews();
+        HSystem.busyApps[ _this.appId ] = false;
+      },
+      10
+    );
   },
   
 /** = Description

data/js/foundation/eventmanager/eventmanager.js

@@ -320,10 +320,12 @@ EVENT = {
   * controls registered for the event.
   **/
   resize: function(e) {
-    var i = 0,
-        _this = EVENT,
-        _ctrlID,
-        _ctrl;
+    var
+    i = 0,
+    _this = EVENT,
+    _ctrlID,
+    _ctrl;
+    HSystem._updateFlexibleRects();
     for (; i < _this.resizeListeners.length; i++) {
       _ctrlID = _this.resizeListeners[i];
       _ctrl = HSystem.views[_ctrlID];

data/js/foundation/system/system.js

@@ -302,17 +302,19 @@ HSystem = {
   **/
   _flushUpdateZIndexOfChilden: function() {
     
-    var j=0, // buffer index
-        
-        // reference to the HSystem namespace
-        _this = HSystem,
-        
-        // reference to the buffer
-        _buffer = _this._updateZIndexOfChildrenBuffer,
-        
-        // the length of the buffer
-        _bufLen = _buffer.length;
-        
+    var
+    
+    j = 0, // buffer index
+    
+    // reference to the HSystem namespace
+    _this = HSystem,
+    
+    // reference to the buffer
+    _buffer = _this._updateZIndexOfChildrenBuffer,
+    
+    // the length of the buffer
+    _bufLen = _buffer.length;
+    
     // loop buffer length times to get the items
     for ( ; j < _bufLen; j++ ) {
       

data/js/foundation/view/view.js

@@ -657,7 +657,7 @@ HView = HClass.extend({
         }
         _styl(_elemId,_key,_value,true);
       }
-      (this.drown === false) && _this._updateZIndex();
+      (this.drawn === false) && _this._updateZIndex();
       
       if ( _this._cachedLeft !== _rect.left || _this._cachedTop !== _rect.top) {
         _this.invalidatePositionCache();
@@ -885,12 +885,18 @@ HView = HClass.extend({
       _width, // = _rect.width,
       _height, // = _rect.height;
       _parentElemId = ( this.parent.markupElemIds && this.parent.markupElemIds.subview ) ? this.parent.markupElemIds.subview : this.parent.elemId;
-//      if (this.parent.flexLeft && this.parent.flexRight){
+     if (this.parent.flexLeft && this.parent.flexRight){
         _width = parseInt( ELEM.getStyle( _parentElemId, 'width', true ), 10 );
-      // }
-      // if (this.parent.flexBottom && this.parent.flexTop){
+      }
+      else {
+        _width = _rect.width;
+      }
+      if (this.parent.flexBottom && this.parent.flexTop){
         _height = parseInt( ELEM.getStyle( _parentElemId, 'height', true ), 10 );
-      // }
+      }
+      else {
+        _height = _rect.height;
+      }
       return [ _width, _height ];
     }
   },
@@ -999,6 +1005,14 @@ HView = HClass.extend({
         }
         this.rect = HRect.nu(_leftOffset,_topOffset,_right,_bottom);
         
+        if(!this.rect.isValid){
+          console.log('---------------------------------------------');
+          console.log('invalid rect:', this.rect.left, ',', this.rect.top, ',', this.rect.width, ',', this.rect.height, ',', this.rect.right, ',', this.rect.bottom );
+          console.log(' parent size:', this.parentSize() );
+          console.log('  rect array:', _rect );
+          console.log('---------------------------------------------');
+        }
+        
       }
       else {
         console.log(_throwPrefix + 'the length has to be either 4 or 6.');

data/js/menus/minimenu/minimenu.js

@@ -102,14 +102,9 @@ HMiniMenu = HRadioButtonList.extend({
   },
   
   drawSubviews: function(){
-    this.markupElemIds.subview = 0;
-    this.menuItemView = HView.extend({
-      bringToFront: function(){
-        this.setStyle('z-index',10000);//this.app.views.length);
-      }
-    }).nu(
-      [ this.rect.left, this.rect.top, this.rect.width, 500 ],
-      this, {
+    this.menuItemView = HView.nu(
+      [ this.rect.left, this.rect.top, this.rect.width, 10 ],
+      this.app, {
         visible: false,
         style: [
           ['background-color','#f6f6f6'],

data/lib/transporter/transporter.rb

@@ -229,6 +229,10 @@ module RSence
           end
           
         elsif msg.refresh_page?( @plugins.incr ) and @config[:client_autoreload]
+          while msg.refresh_page?( @plugins.incr )
+            msg.session[:plugin_incr] == @plugins.incr
+            sleep 0.5
+          end
           # Forces the client to reload, if plugins are incremented
           msg.reply("window.location.reload( true );")
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rsence
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 2
   - 1
-  - 3
-  version: 2.1.3
+  - 4
+  version: 2.1.4
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-12 00:00:00 +02:00
+date: 2010-12-13 00:00:00 +02:00
 default_executable: rsence
 dependencies: 
 - !ruby/object:Gem::Dependency