rsence-pre 2.1.0.8.pre → 2.1.0.9

data/VERSION

@@ -1 +1 @@
-2.1.0.8.pre
+2.1.0.9.pre

data/js/controls/button/button.js

@@ -53,7 +53,12 @@ HClickButton = HButton.extend({
   *
   **/
   refreshValue: function(){
-    this.setEnabled( this.value === 0 );
+    if( this.options.inverseValue ){
+      this.setEnabled( this.value === 1 );
+    }
+    else {
+      this.setEnabled( this.value === 0 );
+    }
   },
 /** = Description
   * Click method, sets the value to disabled if the button is enabled.
@@ -61,7 +66,12 @@ HClickButton = HButton.extend({
   **/
   click: function(){
     if(this.enabled){
-      this.setValue(1);
+      if( this.options.inverseValue ){
+        this.setValue(0);
+      }
+      else {
+        this.setValue(1);
+      }
     }
   }
   

data/js/controls/stepper/stepper.js

@@ -26,6 +26,7 @@ HStepper = HControl.extend({
   
   defaultEvents: {
     mouseDown: true,
+    click: true,
     keyDown: true,
     mouseWheel: true
   },
@@ -101,17 +102,6 @@ HStepper = HControl.extend({
     );
   },
   
-  // -- Returns an action string for the setInterval in _setRepeatInterval ++
-  _repeatIntervalStr: function( _up ){
-    return [
-      'HSystem.views[',
-      this.viewId,
-      '].step',
-      (_up?'Up':'Down'),
-      '();'
-    ].join('');
-  },
-  
   // -- Background-offset of the state images up/down,
   // overrideable in the html template ++
   bgStateUp: '0px -23px',
@@ -131,15 +121,13 @@ HStepper = HControl.extend({
   _setRepeatInterval: function( _up ){
     var _this    = this,
         _options = _this.options;
+    _this._repeatInterval && clearInterval( _this._repeatInterval );
     _this._bgStateOn( _up );
-    if (_up) {
-      _this.stepUp();
-      _this._repeatInterval = setInterval( _this._repeatIntervalStr(1), _options.repeatInterval );
-    }
-    else {
-      _this.stepDown();
-      _this._repeatInterval = setInterval( _this._repeatIntervalStr(0), _options.repeatInterval );
-    }
+    _up?_this.stepUp():_this.stepDown();
+    _this._repeatInterval = setInterval(
+      _up?function(){_this.stepUp();}:function(){_this.stepDown();},
+      _options.repeatInterval
+    );
   },
   
   // Stops the repeating stepping up or down enabled in _setRepeatInterval
@@ -153,6 +141,7 @@ HStepper = HControl.extend({
   mouseDown: function( x, y ){
     this.setMouseUp(true);
     this._setRepeatInterval(  ( y - ELEM.getVisiblePosition( this.elemId )[1] ) <= 11  );
+    
   },
   
   /** Stops the repeating stepping, when the mouse button goes up
@@ -161,6 +150,10 @@ HStepper = HControl.extend({
     this._clearRepeatInterval();
   },
   
+  click: function(){
+    this.mouseUp();
+  },
+  
   /** Stops the repeating stepping, when the control becomes inactive
     **/
   blur: function(){

data/js/controls/window/window.js

@@ -241,7 +241,7 @@ HWindow = HDynControl.extend({
     for( ; i < _views.length; i++ ){
       _view = HSystem.views[_views[i]];
       _size = ELEM.getSize(_view.elemId);
-      _pos  = ELEM.getPosition(_view.elemId);
+      _pos  = ELEM.getVisiblePosition(_view.elemId);
       _right = _size[0]+_pos[0]-this.pageX();
       _bottom = _size[1]+_pos[1]-this.pageY();
       if(_right > _fitsRect.width){

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

@@ -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);
     }
@@ -734,7 +739,7 @@ EVENT = {
     // if it's no longer the active control.
     _prevActiveCtrl = _this.activeControl;
     // Did the active control change?
-    if ((_ctrl !== _prevActiveCtrl) && (_ctrl._gainedActiveStatus || _prevActiveCtrl._lostActiveStatus)) {
+    if (_ctrl && (_ctrl !== _prevActiveCtrl) && (_ctrl._gainedActiveStatus || _prevActiveCtrl._lostActiveStatus)) {
       if (_prevActiveCtrl && _prevActiveCtrl._lostActiveStatus) {
         // Previously active control just lost the active status.
         _prevActiveCtrl.active = false;
@@ -785,7 +790,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) {
@@ -808,10 +813,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);
         }
       }
     }
@@ -860,7 +866,7 @@ EVENT = {
   keyDown: function(e) {
     var _this = EVENT,
         _theKeyCode = e.keyCode,
-        _keyDownStateForActiveControl = _this.activeControl?_this.focusOptions[_this.activeControl.elemId].keyDown:false,
+        _keyDownStateForActiveControl = _this.activeControl?(_this.focusOptions[_this.activeControl.elemId]?_this.focusOptions[_this.activeControl.elemId].keyDown:false):false,
         _repeat = (_keyDownStateForActiveControl === 'repeat'),
         _stopEvent = false;
     _this._modifiers(e);
@@ -902,7 +908,7 @@ EVENT = {
         _ctrl;
     _this._modifiers(e);
     _this._lastKeyDown = null;
-    if (_this.activeControl && _this.focusOptions[_this.activeControl.elemId].keyUp === true) {
+    if (_this.activeControl && _this.activeControl.elemId && _this.focusOptions[_this.activeControl.elemId].keyUp === true) {
       if(_this.activeControl.keyUp(_theKeyCode)){
         _stopEvent = true;
       }

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/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();
       }
     }

data/js/foundation/view/view.js

@@ -615,7 +615,7 @@ HView = HClass.extend({
   **/
   drawRect: function() {
     if(!this.rect.isValid){
-      console.log('invalid rect:',ELEM.get(this.elemId));
+      console.log('invalid rect:',this.rect);//,ELEM.get(this.elemId));
     }
     if(!this.parent){
       console.log('no parent:',ELEM.get(this.elemId));
@@ -830,8 +830,22 @@ HView = HClass.extend({
   * A string with the html escaped.
   **/
   escapeHTML: function( _html ) {
-    return _html.replace(/&/gmi, '&amp;').replace(/>/gmi, '&gt;').replace(/</gmi, '&lt;');
-  },
+    if( typeof _html !== 'string' ) {
+      return _html.toString();
+    }
+    for( var i=0, _reFrom, _reTo, _reArr = this._escapeHTMLArr; i < _reArr.length; i++ ){
+      _reFrom = _reArr[i][0];
+      _reTo = _reArr[i][1];
+      _html = _html.replace( _reFrom, _reTo );
+    } 
+    return _html;
+  },
+  _escapeHTMLArr: [
+    [ new RegExp( /&/gmi ), '&amp;' ],
+    [ new RegExp( />/gmi ), '&gt;' ],
+    [ new RegExp( /</gmi ), '&lt;' ],
+    [ new RegExp( /\n/gmi ), '<br>' ]
+  ],
   
 /** = Description
   *
@@ -927,7 +941,6 @@ HView = HClass.extend({
         _validHeight  = (typeof _height  === 'number'),
         _right,
         _bottom;
-        
         if(_arrLen === 6){
           var
           _parentSize = this.parentSize(),
@@ -976,6 +989,7 @@ HView = HClass.extend({
         }
         
         this.rect = HRect.nu(_leftOffset,_topOffset,_right,_bottom);
+        
       }
       else {
         console.log(_throwPrefix + 'the length has to be either 4 or 6.');

data/js/lists/radiobuttonlist/radiobuttonlist.js

@@ -74,7 +74,7 @@ HRadioButtonList = HControl.extend({
   die: function(){
     this.listItems = null;
     this.listItemViews = null;
-    this.radioButtonIndexValue.die();
+    this.radioButtonIndexValue && this.radioButtonIndexValue.die();
     this.base();
   },
   radioButtonIndexValue: false,

data/js/menus/minimenu/minimenu.js

@@ -105,7 +105,7 @@ HMiniMenu = HRadioButtonList.extend({
     this.markupElemIds.subview = 0;
     this.menuItemView = HView.extend({
       bringToFront: function(){
-        this.setStyle('z-index',this.app.views.length);
+        this.setStyle('z-index',10000);//this.app.views.length);
       }
     }).nu(
       [ this.rect.left, this.rect.top, this.rect.width, 500 ],
@@ -124,6 +124,7 @@ HMiniMenu = HRadioButtonList.extend({
   setListItems: function(listItems){
     this.base(listItems);
     this.valueMatrix = this.menuItemView.valueMatrix;
+    this.refreshValue();
   },
   
   createComponent: function( i, _label ){

data/lib/plugins/plugins.rb

@@ -142,6 +142,15 @@ module RSence
               plugin_src = "_bundle_path = #{params[:bundle_path].inspect};" + plugin_src
             end
             m.module_eval( plugin_src )
+          rescue SyntaxError => e
+            src_path = params[:src_path]
+            src_path = "<undefined src_path>" if src_path == nil
+            params[:plugin_manager].plugin_error(
+              e,
+              'BundleLoaderSyntaxError',
+              "The syntax of #{params[:bundle_name]} is invalid.",
+              src_path
+            )
           rescue => e
             src_path = params[:src_path]
             src_path = "<undefined src_path>" if src_path == nil

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rsence-pre
 version: !ruby/object:Gem::Version 
-  hash: 961916100
-  prerelease: true
+  hash: 117
+  prerelease: false
   segments: 
   - 2
   - 1
   - 0
-  - 8
-  - pre
-  version: 2.1.0.8.pre
+  - 9
+  version: 2.1.0.9
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-12 00:00:00 +03:00
+date: 2010-10-19 00:00:00 +03:00
 default_executable: rsence-pre
 dependencies: 
 - !ruby/object:Gem::Dependency