rsence 2.0.9.23 → 2.1.0

data/js/core/rsence_ns/rsence_ns.js

@@ -12,10 +12,17 @@
 // ..into this namespace.
 // Additional logic for handling the namespaces will however be required.
 var RSence = {
+  
+  // Configuration method for the html document of the server
   serverConf: function(_clientPrefix,_helloUrl){
     COMM.ClientPrefix=_clientPrefix;
     COMM.Transporter.HelloUrl=_helloUrl;
     HThemeManager.themePath=_clientPrefix+'/themes';
+  },
+  
+  // Structure reserved for JSONRenderer instances remotely populated by the server
+  guiTrees: {
+    
   }
 };
 

data/js/foundation/control/eventresponder/eventresponder.js

@@ -174,13 +174,14 @@ HEventResponder = HClass.extend({
   **/
   setEnabled: function(_flag) {
     
-    var _this = this,
-        _elemId = this.elemId,
-        _sysViews = HSystem.views,
-        i = 0,
-        _views = _this.views,
-        _view,
-        _viewsLen = _views.length;
+    var
+    _this = this,
+    _elemId = this.elemId,
+    _sysViews = HSystem.views,
+    i = 0,
+    _views = _this.views,
+    _view,
+    _viewsLen = _views.length;
     
     // Enable/disable the children first.
     for (; i < _viewsLen; i++) {

data/js/foundation/eventmanager/eventmanager.js

@@ -131,7 +131,7 @@ EVENT = {
     var _this = EVENT;
     _this.hovered = [];
     // items currently under the mouse cursor
-    _this.hoverInterval = 50;
+    _this.hoverInterval = 200;
     // 50 means send hover events at most with 50ms intervals
     _this.hoverTimer = new Date().getTime();
     // Time since last hover event triggered
@@ -210,21 +210,23 @@ EVENT = {
 /** Registers the _ctrl object by event listener flags in _focusOptions.
   **/
   reg: function(_ctrl, _focusOptions) {
-    var _elemId,
-        _elem,
-        _this = EVENT,
-        _propIn;
+    var
     // Binds the class to the element (so it can be called on the event)
-    _elemId = _ctrl.elemId;
-    _elem = ELEM.get(_elemId);
+    _elemId = _ctrl.elemId,
+    _elem = ELEM.get(_elemId),
+    _this = EVENT,
+    _propIn,
+    _init = ( _this.listeners[_elemId] === undefined ||  _this.listeners[_elemId] === false );
     if (BROWSER_TYPE.ie) {
       _elem.setAttribute('ctrl', _ctrl);
     }
     else {
       _elem.ctrl = _ctrl;
     }
-    _this.listeners[_elemId] = true;
-    _this.focused[_elemId] = false;
+    if(_init){
+      _this.listeners[_elemId] = true;
+      _this.focused[_elemId] = false;
+    }
     for (_propIn in _this._defaultFocusOptions) {
       if (_focusOptions[_propIn] === undefined) {
         _focusOptions[_propIn] = _defaultFocusOptions[_propIn];
@@ -264,7 +266,9 @@ EVENT = {
         _this.resizeListeners.splice(_resizeIndex,1);
       }
     }
-    Event.observe(_elem, 'mouseover', _this._mouseOver);
+    if(_init){
+      Event.observe(_elem, 'mouseover', _this._mouseOver);
+    }
     if(_ctrl.drawn){
       _this._updateHoverItems();
       (_this.hovered.length !== 0) && (_this.hovered.indexOf(_ctrl.elemId) === _this.hovered.length-1) && _this.focus(_ctrl);
@@ -274,9 +278,10 @@ EVENT = {
 /** Unregisters the  _ctrl object event listeners
   **/
   unreg: function(_ctrl) {
-    var _this = EVENT,
-        _elemId,
-        _elem;
+    var
+    _this = EVENT,
+    _elemId,
+    _elem;
     if (_ctrl === this.activeControl) {
       _this.changeActiveControl(null);
     }
@@ -479,12 +484,14 @@ EVENT = {
             _hoverIndex = _this.hovered[j];
             if (_hoverIndex !== _elemId && _this.focusOptions[_hoverIndex].ctrl) {
               _dropCtrl = _this.focusOptions[_hoverIndex].ctrl;
-              if (!_this.topmostDroppable ||
-              // First time
-              _dropCtrl.zIndex() > _this.topmostDroppable.zIndex() ||
-              // Z beaten
-              _dropCtrl.supr === _this.topmostDroppable) {
+              if (
+                // First time
+                !_this.topmostDroppable ||
+                // Z beaten
+                _dropCtrl.zIndex() > _this.topmostDroppable.zIndex() ||
                 // subview
+                _dropCtrl.parent === _this.topmostDroppable
+              ) {
                 if (_this.focusOptions[_dropCtrl.elemId].droppable) {
                   _this.topmostDroppable = _dropCtrl;
                   // Finally, the item must accept drop events.
@@ -526,6 +533,7 @@ EVENT = {
         i = 0,
         _ctrl,
         _elem,
+        _rect,
         _pos,
         _size,
         _coords,
@@ -536,24 +544,24 @@ EVENT = {
       }
       _ctrl = _this.focusOptions[i].ctrl;
       if(_ctrl.drawn){
+        if(ELEM.getStyle(i,'visibility',true) === 'hidden'){
+          continue;
+        }
         _elem = ELEM.get(i);
         if (!_this._coordCacheFlag || !_this._coordCache[i]) {
-          _pos = ELEM.getVisiblePosition(_ctrl.elemId);
-          // [x,y]
-          _size = ELEM.getVisibleSize(_ctrl.elemId);
-          // [w,h]
+          _rect = _ctrl.rect;
+          _pos = [_ctrl.pageX(),_ctrl.pageY()];
+          _size = [_rect.width,_rect.height];
           _this._coordCache[i] = [_pos[0], _pos[1], _size[0], _size[1]];
         }
         _coords = _this._coordCache[i];
       
         // Is the mouse pointer inside the element's rectangle?
         if (x >= _coords[0] && x <= _coords[0] + _coords[2] && y >= _coords[1] && y <= _coords[1] + _coords[3]) {
-          // console.log('coords:',_coords);
           _hovered.push(i);
         }
       }
     }
-    // console.log('update hover:',_hovered);
     _this.hovered = _hovered;
   },
 
@@ -713,28 +721,40 @@ EVENT = {
     }
     return true;
   },
-
+  
+  focusTrace: false,
+  prevActiveCtrl: null,
+  
 /** Changes active ctrl.
   * The previous active ctrl gets the _lostActiveStatus pseudo-event,
   * The new active ctrl gets the _gainedActiveStatus pseudo-event
   **/
   changeActiveControl: function(_ctrl) {
-    //console.log('EVENT.changeActiveControl: ',_ctrl);
-    var _this = EVENT,
-        // Store the currently active control so we can inform it, if it no longer is the active control.
-        _prevActiveCtrl = _this.activeControl;
+    var
+    _this = EVENT,
+    // Store the currently active control so we can inform it,
+    // if it's no longer the active control.
+    _prevActiveCtrl = _this.activeControl;
     // Did the active control change?
-    if (_ctrl !== _prevActiveCtrl) {
-      if (_prevActiveCtrl) {
+    if (_ctrl && (_ctrl !== _prevActiveCtrl) && (_ctrl._gainedActiveStatus || _prevActiveCtrl._lostActiveStatus)) {
+      if (_prevActiveCtrl && _prevActiveCtrl._lostActiveStatus) {
         // Previously active control just lost the active status.
         _prevActiveCtrl.active = false;
         _prevActiveCtrl._lostActiveStatus(_ctrl);
+        if(_this.focusTrace){
+          _prevActiveCtrl.setStyle('border','2px solid green');
+          _this.prevActiveCtrl && _this.prevActiveCtrl.setStyle('border','2px solid blue');
+        }
+        _this.prevActiveCtrl = _prevActiveCtrl;
       }
-      if (_ctrl) {
+      if (_ctrl && _ctrl._gainedActiveStatus) {
         // A new control gained the active status.
         _ctrl.active = true;
         _this.activeControl = _ctrl;
         _ctrl._gainedActiveStatus(_prevActiveCtrl);
+        if(_this.focusTrace){
+          _ctrl.setStyle('border','2px solid red');
+        }
       }
       else {
         _this.activeControl = null;
@@ -767,7 +787,7 @@ EVENT = {
     for (; i !== _this.dragItems.length; i++) {
       _elemId = _this.dragItems[i];
       _ctrl = _this.focusOptions[_elemId].ctrl;
-      _ctrl.endDrag(x, y,_isLeftButton);
+      _ctrl.endDrag(x, y, _isLeftButton);
       _didEndDrag = true;
       // If the mouse slipped off the dragged item before the mouse button was released, blur the item manually
       if (_this.enableDroppableChecks) {
@@ -790,10 +810,11 @@ EVENT = {
       document.onselectstart = _this._storedOnSelectStart;
     }
     // Check for mouseUp listeners.
-    for (i = 0; i !== _this.focused.length; i++) {
+    for (i = 0; i < _this.focused.length; i++) {
       if (_this.focused[i] === true) {
+        _ctrl = _this.focusOptions[i].ctrl;
         if (_this.focusOptions[i].mouseUp === true) {
-          _this.focusOptions[i].ctrl.mouseUp(x, y, _isLeftButton);
+          _ctrl.mouseUp(x, y, _isLeftButton);
         }
       }
     }
@@ -841,22 +862,28 @@ EVENT = {
   **/
   keyDown: function(e) {
     var _this = EVENT,
-        _theKeyCode = e.keyCode;
+        _theKeyCode = e.keyCode,
+        _keyDownStateForActiveControl = _this.activeControl?(_this.focusOptions[_this.activeControl.elemId]?_this.focusOptions[_this.activeControl.elemId].keyDown:false):false,
+        _repeat = (_keyDownStateForActiveControl === 'repeat'),
+        _stopEvent = false;
     _this._modifiers(e);
     if(!_this.status[_this.cmdKeyDown] && _this._detectCmdKey(e.keyCode)){
       _this.status[_this.cmdKeyDown] = true;
     }
-    if (_this.activeControl && _this.focusOptions[_this.activeControl.elemId].keyDown === true) {
-      Event.stop(e);
-      // Workaround for msie rapid fire keydown
-      if (_this._lastKeyDown !== _theKeyCode) {
-        _this.activeControl.keyDown(_theKeyCode);
+    if (_this.activeControl && _keyDownStateForActiveControl) {
+      if ((_this._lastKeyDown !== _theKeyCode) || _repeat) {
+        if(_this.activeControl.keyDown(_theKeyCode)){
+          _stopEvent = true;
+        }
       }
     }
     // Insert key to the realtime array, remove in keyUp
     if (_this.status[_this.keysDown].indexOf(_theKeyCode) === -1) {
       _this.status[_this.keysDown].push(_theKeyCode);
     }
+    if (!_this.status[_this.cmdKeyDown] && _stopEvent){
+      Event.stop(e);
+    }
     _this._lastKeyDown = _theKeyCode;
   },
 
@@ -873,20 +900,28 @@ EVENT = {
         _theKeyCode = e.keyCode,
         _keyCodeIndex,
         i = 0,
+        _stopEvent = false,
         _ctrlId,
         _ctrl;
     _this._modifiers(e);
     _this._lastKeyDown = null;
-    if (_this.activeControl && _this.focusOptions[_this.activeControl.elemId].keyUp === true) {
-      _this.activeControl.keyUp(_theKeyCode);
+    if (_this.activeControl && _this.activeControl.elemId && _this.focusOptions[_this.activeControl.elemId].keyUp === true) {
+      if(_this.activeControl.keyUp(_theKeyCode)){
+        _stopEvent = true;
+      }
     }
     for (; i < _this.textEnterCtrls.length; i++) {
       _ctrlId = _this.textEnterCtrls[i];
       _ctrl = HSystem.views[_ctrlId];
       if (_ctrl.textEnter) {
-        _ctrl.textEnter();
+        if(_ctrl.textEnter()){
+          _stopEvent = true;
+        }
       }
     }
+    if (!_this.status[_this.cmdKeyDown] && _stopEvent){
+      Event.stop(e);
+    }
     if(_this.status[_this.cmdKeyDown] && _this._detectCmdKey(e.keyCode)){
       _this.status[_this.cmdKeyDown] = false;
     }
@@ -897,12 +932,10 @@ EVENT = {
     }
   },
 
-  /* Prevents the onKeyPress event (key being hold down; we don't need that event) */
+  /* Using keyPress as an alias for the keyDown event */
   keyPress: function(e) {
     var _this = EVENT;
-    if (_this.activeControl && _this.focusOptions[_this.activeControl.elemId].keyDown === true) {
-      Event.stop(e);
-    }
+    _this.keyDown(e);
   },
 
 

data/js/foundation/geom/rect/rect.js

@@ -134,7 +134,7 @@ HRect = HClass.extend({
         }
         _parentHeight = _parentSize[1];
         if(_view.flexBottom){
-          _this.bottom = _parentWidth - _view.flexBottomOffset - _this.top;
+          _this.bottom = _parentHeight - _view.flexBottomOffset - _this.top;
         }
         if(!_view.flexTop){
           _this.top = _this.bottom - _this.height;

data/js/foundation/json_renderer/json_renderer.js

@@ -24,7 +24,7 @@
 //var//RSence.Foundation
 COMM.JSONRenderer = HClass.extend({
   
-  version: 0.6,
+  version: 0.7,
 
 /** = Description
   * Renders JSON structured data, see some of the demos for usage examples.
@@ -48,6 +48,9 @@ COMM.JSONRenderer = HClass.extend({
     this.scopeDepth = 0;
     this.view = this.renderNode( this.data, this.parent );
   },
+  die: function(){
+    this.view.die();
+  },
   defineInScope: function( _definition ){
     var _isArr = (_definition instanceof Array),
         _isObj = (_definition instanceof Object);

data/js/foundation/system/system.js

@@ -97,7 +97,7 @@ HSystem = {
     i = 0;
     for( ; i < this.views.length; i++ ){
       _view = this.views[i];
-      if(_view.flexRight || _view.flexBottom){
+      if(_view && (_view.flexRight || _view.flexBottom)){
         _view.rect._updateFlexibleDimensions();
       }
     }
@@ -292,6 +292,9 @@ HSystem = {
     if(this._updateZIndexOfChildrenBuffer.indexOf(_viewId)===-1){
       this._updateZIndexOfChildrenBuffer.push(_viewId);
     }
+    if((_viewId !== undefined && _viewId !== null) && (this.views[_viewId].app === this.views[_viewId].parent)){
+      (this._updateZIndexOfChildrenBuffer.indexOf(null)===-1) && this._updateZIndexOfChildrenBuffer.push(null);
+    }
   },
   
 /** Flushes the z-indexes. This is a fairly expensive operation,
@@ -305,7 +308,7 @@ HSystem = {
         _this = HSystem,
         
         // reference to the buffer
-        _buffer = this._updateZIndexOfChildrenBuffer,
+        _buffer = _this._updateZIndexOfChildrenBuffer,
         
         // the length of the buffer
         _bufLen = _buffer.length;
@@ -315,40 +318,40 @@ HSystem = {
       
       
       // get and remove view the view id from the z-index flush status buffer:
-      var _viewId = _buffer.shift(),
-          
-          // reference to the view's z-index array or the system root-level views if _viewId is 0
-          _views = ((_viewId === null)?(_this.viewsZOrder):(_this.views[ _viewId ].viewsZOrder)),
-          
-          // the length of the view's z-index array
-          _viewLen = _views.length,
-          
-          // reference to the setStyle method of the element manager
-          _setStyl = ELEM.setStyle,
-          
-          // reference to HSystem.views (collection of all views, by index)
-          _sysViews = _this.views,
-          
-          
+      var
+      _viewId = _buffer.shift(),
+      
+      // reference to the view's z-index array or the system root-level views if _viewId is null
+      _views = ((_viewId === null)?(_this.viewsZOrder):(_this.views[ _viewId ].viewsZOrder)),
+      
+      // the length of the view's z-index array
+      _viewLen = _views.length,
+      
+      // reference to the setStyle method of the element manager
+      _setStyl = ELEM.setStyle,
+      
+      // reference to HSystem.views (collection of all views, by index)
+      _sysViews = _this.views,
+      
       // assign variables for use inside the inner loop:
           
-          // the viewId of the view to be updated
-          _subViewId,
-          
-          // the view itself with the viewId above
-          _view,
-          
-          // the elemId property, used as a [] -lookup in the loop
-          _elemIdStr = 'elemId',
-          
-          // the css property name
-          _zIdxStr = 'z-index',
-          
-          // the loop index
-          i=0,
-          
-          // the element id of the view
-          _elemId;
+      // the viewId of the view to be updated
+      _subViewId,
+      
+      // the view itself with the viewId above
+      _view,
+      
+      // the elemId property, used as a [] -lookup in the loop
+      _elemIdStr = 'elemId',
+      
+      // the css property name
+      _zIdxStr = 'z-index',
+      
+      // the loop index
+      i=0,
+      
+      // the element id of the view
+      _elemId;
       
       // end of var declarations
       

data/js/foundation/view/morphanimation/morphanimation.js

@@ -63,7 +63,7 @@ HMorphAnimation = HClass.extend({
       this._animateTo(_obj, _duration);
     }
     else {
-      throw "Wrong argument type.";
+      this._animateTo(_obj, _duration);
     }
     return this;
   },
@@ -77,7 +77,7 @@ HMorphAnimation = HClass.extend({
   * is still in action.
   *  
   */
-  stopAnimation: function() {
+  stopAnimation: function(_target) {
     if (this._animateInterval) {
       // Stop the animation interval only if it has been set.
       window.clearInterval(this._animateInterval);
@@ -102,10 +102,45 @@ HMorphAnimation = HClass.extend({
     return this;
   },
   
+  _animFunction: function(_that,_target,_startTime,_duration){
+    return function(){
+      if(!_that){
+        return;
+      }
+      var _rect = _target;
+      _that._animateStep({
+        startTime: _startTime,
+        duration: _duration,
+        // Linear transition effect.
+        transition: function(t, b, c, d) { return c * t / d + b; },
+        props: [{
+          prop: 'left',
+          from: _that.rect.left,
+          to: _rect.left,
+          unit: 'px'
+        },{
+          prop: 'top',
+          from: _that.rect.top,
+          to: _rect.top,
+          unit: 'px'
+        },{
+          prop: 'width',
+          from: _that.rect.width,
+          to: _rect.width,
+          unit: 'px'
+        },{
+          prop: 'height',
+          from: _that.rect.height,
+          to: _rect.height,
+          unit: 'px'
+        }]
+      });
+    };
+  },
   
   // --Private method.++
   // --Starts the animation with the target _rect.++
-  _animateTo: function(_rect, _duration, _fps) {
+  _animateTo: function(_target, _duration, _fps) {
     
     if (null === _duration || undefined === _duration) {
       _duration = 500; // default duration is half second
@@ -120,41 +155,9 @@ HMorphAnimation = HClass.extend({
       this.onAnimationStart();
       
       var _startTime = new Date().getTime();
-      
-      var _that = this;
       this._animateInterval = window.setInterval(
-        function() {
-          if(!_that){
-            return;
-          }
-          _that._animateStep({
-            startTime: _startTime,
-            duration: _duration,
-            // Linear transition effect.
-            transition: function(t, b, c, d) { return c * t / d + b; },
-            props: [{
-              prop: 'left',
-              from: _that.rect.left,
-              to: _rect.left,
-              unit: 'px'
-            },{
-              prop: 'top',
-              from: _that.rect.top,
-              to: _rect.top,
-              unit: 'px'
-            },{
-              prop: 'width',
-              from: _that.rect.width,
-              to: _rect.width,
-              unit: 'px'
-            },{
-              prop: 'height',
-              from: _that.rect.height,
-              to: _rect.height,
-              unit: 'px'
-            }]
-          });
-        }, Math.round(1000 / _fps)
+        this._animFunction(this, _target, _startTime, _duration),
+        Math.round(1000 / _fps)
       );
     }
     return this;
@@ -165,21 +168,28 @@ HMorphAnimation = HClass.extend({
   // --Moves the view for one step. This gets called repeatedly when the animation++
   // --is happening.++
   _animateStep: function(_obj) {
-    
     var _time = new Date().getTime(), i;
     if (_time < _obj.startTime + _obj.duration) {
       var _cTime = _time - _obj.startTime;
       
       // Handle all the defined properties.
       for (i = 0; i < _obj.props.length; i++) {
-        var _from = _obj.props[i].from;
-        var _to = _obj.props[i].to;
+        var
+        _from = _obj.props[i].from,
+        _to = _obj.props[i].to;
         
         if (_from !== _to) {
           // The value of the property at this time.
-          var _propNow = _obj.transition(_cTime, _from, (_to - _from),
-            _obj.duration);
-          ELEM.setStyle(this.elemId,_obj.props[i].prop, _propNow + _obj.props[i].unit);
+          var
+          _key = _obj.props[i].prop,
+          _propNow = _obj.transition(
+            _cTime, _from, (_to - _from), _obj.duration
+          ),
+          _unit = _obj.props[i].unit;
+          if(_unit){
+            _propNow += _unit;
+          }
+          ELEM.setStyle(this.elemId,_key, _propNow);
         }
       }