rsence 2.1.1 → 2.1.2

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.1.2

data/js/comm/transporter/transporter.js

@@ -240,6 +240,7 @@ COMM.Transporter = HApplication.extend({
     // console.log('sync.');
     this.busy = true;
     if(window['sesWatcher'] && window.sesWatcher['sesTimeoutValue']){
+      // Sets the value of the session watcher to the current time. It could cause an unnecessary re-sync poll immediately after this sync otherwise.
       sesWatcher.sesTimeoutValue.set( new Date().getTime() );
     }
     var _this = this,

data/js/controls/imageview/imageview.js

@@ -32,10 +32,13 @@ HImageView = HControl.extend({
   })),
   
   _makeScaleToFit: function(_parentId){
-    this.elemId = ELEM.make(_parentId,'img');
-    ELEM.setAttr(this.elemId,'src',this.getImgSrc());
-    ELEM.setAttr(this.elemId,'alt',this.label);
-    ELEM.setAttr(this.elemId,'title',this.label);
+    this.elemId = ELEM.make( _parentId, 'img', {
+      attrs: [
+        [ 'src',   this.getImgSrc() ],
+        [ 'alt',   this.label ],
+        [ 'title', this.label ]
+      ]
+    } );
   },
   _makeScaleToOriginal: function(_parentId){
     this.elemId = ELEM.make(_parentId,'div');
@@ -58,11 +61,17 @@ HImageView = HControl.extend({
   * 
   **/
   refreshValue: function(){
+    var _src = this.getImgSrc();
     if(this.options.scaleToFit){
-      ELEM.setAttr(this.elemId,'src',this.getImgSrc());
+      if(ELEM.getAttr(this.elemId,'src')!==_src){
+        ELEM.setAttr(this.elemId,'src',_src);
+      }
     }
     else{
-      ELEM.setStyle(this.elemId,'background-image','url('+this.getImgSrc()+')');
+      var _url = 'url('+this.getImgSrc()+')';
+      if(ELEM.getStyle(this.elemId,'background-image') != _url){
+        ELEM.setStyle(this.elemId,'background-image',_url);
+      }
     }
   },
   

data/js/core/elem/elem.js

@@ -774,7 +774,6 @@ ELEM = {
       _key = _currTodo.pop();
       _val = _attrCache[_key];
       _elem.setAttribute(_key, _val);
-      //_elem[_key]=_val;
     }
   },
   
@@ -827,7 +826,7 @@ ELEM = {
         _attrTodo = _this._attrTodo[_id],
         _attrCache = _this._attrCache[_id],
         _differs = _value !== _this.getAttr(_id, _key);
-    if (_differs) {
+    if (_differs || _bypass) {
       _attrCache[_key] = _value;
       if (_bypass) {
         _this._elements[_id].setAttribute(_key, _value);
@@ -1043,11 +1042,15 @@ ELEM = {
   * +_tagName+::  The tag name of the element.
   *               (Optional, default: 'DIV')
   *
+  * +_options+::  Options to set before appending child to parent.
+  *               Supported option attrs: [[key,value],[key,value]]
+  *               (Optional, rarely necessary except when creating IMG tags)
+  *
   * = Returns
   * The new ELEM ID.
   *
   **/
-  make: function(_targetId, _tagName) {
+  make: function(_targetId, _tagName, _options) {
     if (_targetId === undefined) {
       _targetId = 0;
     }
@@ -1084,9 +1087,22 @@ ELEM = {
       }
     }
     _elem = document.createElement(_tagName);
-    _this._elements[_targetId].appendChild(_elem);
     _id = _this._add(_elem);
     _this._initCache(_id);
+    if(_options!==undefined){
+      if(_options.attrs){
+        var
+        i = 0,
+        _key, _value;
+        for( ; i<_options.attrs.length; i++ ){
+          _key = _options.attrs[i][0];
+          _value = _options.attrs[i][1];
+          _elem[_key] = _value;
+          _this.setAttr( _id, _key, _value );
+        }
+      }
+    }
+    _this._elements[_targetId].appendChild(_elem);
     return _id;
   },
   

data/js/datetime/timesheet/timesheet.js

@@ -11,10 +11,36 @@
   ***/
 var//RSence.DateTime
 HTimeSheet = HControl.extend({
+  
   componentName: 'timesheet',
+  
+  /* Default amount of pixels per hour. Override with options when necessary. */
   pxPerHour: 24,
+  
+  /* Default amount of pixels from left. Override with options when necessary. */
   itemOffsetLeft: 36,
+  
+  /* Default amount of pixels from right. Override with options when necessary. */
   itemOffsetRight: 0,
+  
+  controlDefaults: HControlDefaults.extend({
+    pxPerHour: null,
+    itemOffsetLeft: null,
+    itemOffsetRight: null,
+    newItemLabel: 'New Item',
+    constructor: function(_ctrl){
+      if(this.pxPerHour !== null){
+        _ctrl.pxPerHour = this.pxPerHour;
+      }
+      if(this.itemOffsetLeft !== null){
+        _ctrl.itemOffsetLeft = this.itemOffsetLeft;
+      }
+      if(this.itemOffsetRight !== null){
+        _ctrl.itemOffsetRight = this.itemOffsetRight;
+      }
+    }
+  }),
+  
 /** = Description
   * Redraws the timesheet.
   *
@@ -82,16 +108,7 @@ HTimeSheet = HControl.extend({
     if(origY>maxY){
       origY = maxY;
     }
-    var item = HTimeSheetItem.nu(
-      this.createItemRect(origY,lineHeight),
-      this, {
-        label: 'New Item',
-        events: {
-          draggable: true
-        }
-      }
-    );
-    this.dragItem = item;
+    this.dragItem = this.createTimeSheetItem( { label: this.options.newItemLabel }, origY, lineHeight, 'create' );
   },
   
 /** = Description
@@ -144,6 +161,44 @@ HTimeSheet = HControl.extend({
     this.base();
   },
   
+/** = Description
+  * Returns a new time sheet item control. By default returns an instance
+  * of HTimeSheetItem. Extend to use custom time sheet controls customized
+  * for application specific purposes.
+  *
+  * = Parameters
+  * *_value*::      A value object for the item.
+  * *_top*::        Top position, 0 by default.
+  * *_height*::     Height, same as half of +#pxPerHour+ by default.
+  * *_drogMode*::   Dragging mode. 'normal' or 'create'. Is 'normal' by default.
+  *
+  **/
+  createTimeSheetItem: function( _value, _top, _height, _dragMode ) {
+    if(_dragMode===undefined){
+      _dragMode = 'normal';
+    }
+    if(_top===undefined){
+      _top = 0;
+    }
+    if(_height===undefined){
+      _height = Math.round(this.pxPerHour/2);
+    }
+    var
+    _label = _value['label'],
+    _item = HTimeSheetItem.nu(
+      this.createItemRect( _top, _height ),
+      this, {
+        label: _label,
+        value: _value,
+        events: {
+          draggable: true
+        }
+      }
+    );
+    _item.dragMode = _dragMode;    
+    return _item;
+  },
+  
 /** = Description
   * Redraws and refreshes the values on timesheet.
   *
@@ -160,21 +215,10 @@ HTimeSheet = HControl.extend({
       this.listItemViews = [];
     }
     if(_data instanceof Array){
-      var _value, _label, _item;
+      var _value, _item;
       for( i=0; i<_data.length; i++){
         _value = _data[i];
-        _label = _value['label'];
-        _item = HTimeSheetItem.nu(
-          this.createItemRect( 0, 12 ),
-          this, {
-            label: _label,
-            value: _value,
-            events: {
-              draggable: true
-            }
-          }
-        );
-        _item.dragMode = 'normal';
+        _item = this.createTimeSheetItem( _value );
         this.listItemViews.push( _item );
       }
     }

data/js/datetime/timesheet_item/timesheet_item.js

@@ -11,11 +11,25 @@
   ***/
 var//RSence.DateTime
 HTimeSheetItem = HControl.extend({
+  
   componentName: 'timesheet_item',
+  
+  /* 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. */
   prevXY: [0,0],
+  
+  /* The time at the previous coordinate. Used to detect double-drag as double-click. */
   prevXYTime: 0,
   
+  controlDefaults: HControlDefaults.extend({
+    dragMode: 'create',
+    constructor: function(_ctrl){
+      _ctrl.dragMode = this.dragMode;
+    }
+  }),
+  
 /** = Description
   * Dragging is used to change coordinates.
   *
@@ -31,7 +45,7 @@ HTimeSheetItem = HControl.extend({
           _xEquals = (Math.round(this.prevXY[0]/4) === Math.round(x/4)),
           _yEquals = (Math.round(this.prevXY[1]/4) === Math.round(y/4)),
           _noTimeout = ((_timeNow - this.prevXYTime) < 500);
-      if( _xEquals && _yEquals && _noTimeout ) {
+      if( _xEquals && _yEquals && _noTimeout ) { // doubleClick
         if( this.parent['editor'] ){
           var _editor = this.parent.editor;
           _editor.setTimeSheetItem(this);
@@ -207,19 +221,18 @@ HTimeSheetItem = HControl.extend({
         _value;
     if(this.dragMode === 'create'){
       this.parent.listItemViews.push( this );
-      _value = {
-        'timeBegin': this.rect.top/_pxPerHour,
-        'timeEnd': this.rect.bottom/_pxPerHour,
-        'label': this.label
-      };
+      _value = {};
+      this._setValueTop( _value );
+      this._setValueBottom( _value );
+      this._setValueLabel( _value );
       if(this.parent['editor']){
         this.parent.editor.createItem( _value );
       }
     }
     else {
       _value = COMM.Values.clone( this.value );
-      _value['timeBegin'] = this.rect.top/_pxPerHour;
-      _value['timeEnd'] = this.rect.bottom/_pxPerHour;
+      this._setValueTop( _value );
+      this._setValueBottom( _value );
       if(this.parent['editor']){
         this.parent.editor.modifyItem( _value );
       }
@@ -229,17 +242,39 @@ HTimeSheetItem = HControl.extend({
     return true;
   },
   
+  _setValueTop: function( _value ) {
+    _value['timeBegin'] = this.rect.top/this.parent.pxPerHour;
+  },
+  
+  _setValueBottom: function( _value ) {
+    _value['timeEnd'] = this.rect.bottom/this.parent.pxPerHour;
+  },
+  
+  _setValueLabel: function( _value ) {
+    _value['label'] = this.label;
+  },
+  
+  _getValueLabel: function( _value ){
+    return _value.label;
+  },
+  
+  _getValueTop: function( _value ){
+    return _value.timeBegin * this.parent.pxPerHour;
+  },
+  
+  _getValueBottom: function( _value ){
+    return _value.timeEnd * this.parent.pxPerHour;
+  },
+  
 /** = Description
   * Refreshes the object's label and place on the HTimeSheet.
   *
   **/
   refreshValue: function(){
-    var _value = this.value,
-        _pxPerHour = this.parent.pxPerHour;
-    if((_value instanceof Object) && !(_value instanceof Array)){
-      this.setLabel( _value['label'] );
-      this.rect.setTop( _value['timeBegin'] * _pxPerHour );
-      this.rect.setBottom( _value['timeEnd'] * _pxPerHour );
+    if ( HVM.type(this.value) === 'h' ){
+      this.setLabel( this._getValueLabel( this.value ) );
+      this.rect.setTop( this._getValueTop( this.value ) );
+      this.rect.setBottom( this._getValueBottom( this.value ) );
       this.drawRect();
     }
   }

data/js/foundation/control/dyncontrol/dyncontrol.js

@@ -431,7 +431,13 @@ HDynControl = HControl.extend({
   **/
   startDrag: function(x,y,_isRightButton){
     var _parent = this.parent;
-    if(_parent.elemId){
+    // parent outer position
+    // parent inner position, if it has subviews with different offset.
+    if ( _parent.markupElemIds && _parent.markupElemIds.subview ) {
+      x -= ELEM._getVisibleLeftPosition( _parent.markupElemIds.subview );
+      y -= ELEM._getVisibleTopPosition( _parent.markupElemIds.subview );
+    }
+    else if(_parent.elemId){
       x-=_parent.pageX();
       y-=_parent.pageY();
     }
@@ -459,7 +465,11 @@ HDynControl = HControl.extend({
   **/
   drag: function(x,y){
     var _parent = this.parent;
-    if(_parent.elemId){
+    if ( _parent.markupElemIds && _parent.markupElemIds.subview ) {
+      x -= ELEM._getVisibleLeftPosition( _parent.markupElemIds.subview );
+      y -= ELEM._getVisibleTopPosition( _parent.markupElemIds.subview );
+    }
+    else if(_parent.elemId){
       x-=_parent.pageX();
       y-=_parent.pageY();
     }
@@ -485,7 +495,11 @@ HDynControl = HControl.extend({
   endDrag: function(x,y,_isRightButton){
     this.base();
     var _parent = this.parent;
-    if(_parent.elemId){
+    if ( _parent.markupElemIds && _parent.markupElemIds.subview ) {
+      x -= ELEM._getVisibleLeftPosition( _parent.markupElemIds.subview );
+      y -= ELEM._getVisibleTopPosition( _parent.markupElemIds.subview );
+    }
+    else if(_parent.elemId){
       x-=_parent.pageX();
       y-=_parent.pageY();
     }

data/js/foundation/view/view.js

@@ -882,14 +882,15 @@ HView = HClass.extend({
     else {
       var
       _rect = this.parent.rect,
-      _width = _rect.width,
-      _height = _rect.height;
-      if (this.parent.flexLeft && this.parent.flexRight){
-        _width = parseInt( ELEM.getStyle(this.parent.elemId,'width',true), 10 );
-      }
-      if (this.parent.flexBottom && this.parent.flexTop){
-        _height = parseInt( ELEM.getStyle(this.parent.elemId,'height',true), 10 );
-      }
+      _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){
+        _width = parseInt( ELEM.getStyle( _parentElemId, 'width', true ), 10 );
+      // }
+      // if (this.parent.flexBottom && this.parent.flexTop){
+        _height = parseInt( ELEM.getStyle( _parentElemId, 'height', true ), 10 );
+      // }
       return [ _width, _height ];
     }
   },

data/lib/values/hvalue.rb

@@ -84,7 +84,10 @@ module RSence
       if RSence.args[:debug] and meta[:name] and not msg.valuemanager.id_exists?( msg, meta[:name] )
         @value_id   = meta[:name]
       else
-        @value_id   = msg.valuemanager.randgen.gen
+        @value_id = '_'
+        while @value_id[0] == 95 # ascii for '_'
+          @value_id   = msg.valuemanager.randgen.gen
+        end
       end
       
       @meta = meta

data/plugins/main/main.rb

@@ -282,16 +282,15 @@ class MainPlugin < Plugin
     ## url_responder is bound in the client-space
     ## to tell the server its status by updating its value
     location_href_id = ses[:location_href].val_id.to_json
-    msg.reply "COMM.Values.values[#{location_href_id}].bind(COMM.urlResponder);"
+    msg.reply "try{COMM.Values.values[#{location_href_id}].bind(COMM.urlResponder);}catch(e){console.log('urlResponder failed, reason:',e);}"
     
-    ## This enables SesWatcher that changes :client_time every 60 seconds.
-    ## It makes the client to poll the server on regular intervals, when polling mode
-    ## is disabled.
+    ## This enables SesWatcher that changes :client_time every n seconds, which depends on the server_poll_interval configuration setting.
+    ## It makes the client to poll the server on regular intervals, when polling mode is disabled.
     # 5000ms = 5secs
     
     client_time_id = ses[:client_time].val_id.to_json
     poll_interval = ::RSence.config[:main_plugin][:server_poll_interval]
-    msg.reply "sesWatcher = COMM.SessionWatcher.nu(#{poll_interval},#{client_time_id});"
+    msg.reply "try{window.sesWatcher=COMM.SessionWatcher.nu(#{poll_interval},#{client_time_id});}catch(e){console.log('sesWatcher failed, reason:',e);}"
     
   end
   

metadata

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