rsence-pre 3.0.0.8 → 3.0.0.9

data/client/js/controls/stepper/stepper.js

@@ -1,7 +1,7 @@
 
 /*** = Description
-  ** HStepper is a control unit made of two adjacent buttons with up and down arrows 
-  ** to select the previous or next of a set of contiguous values. 
+  ** HStepper is a control unit made of two adjacent buttons with up and down arrows
+  ** to select the previous or next of a set of contiguous values.
   ** Normally, a HStepper instance works in combination with a HTextControl or a HStringView instance.
   **
   ** = Instance Variables
@@ -14,34 +14,34 @@
 
 var//RSence.Controls
 HStepper = HControl.extend({
-  
+
   componentName: "stepper",
-  
+
   defaultEvents: {
     mouseDown: true,
     click: true,
     keyDown: true,
     mouseWheel: true
   },
-  
-  controlDefaults: (HControlDefaults.extend({
+
+  controlDefaults: HControlDefaults.extend({
     minValue: 0,
     maxValue: 100,
     stepSize: 1,
     repeatInterval: 200,
     wrapAround: false
-  })),
-  
+  }),
+
   /** Setter for wrap-around behaviour
     **/
   setWrapAround: function(_on){
     this.options.wrapAround = _on;
   },
-  
+
   // -- Makes sure the value is in its boundaries and either wrap-around
   // to min/max or revert to the current value ++
   _checkValueBoundaries: function(_value){
-    
+
     // -- checks for boundaries ++
     var _this     = this,
         _options  = _this.options,
@@ -50,15 +50,15 @@ HStepper = HControl.extend({
         _tooSmall = _value<_minVal,
         _tooBig   = _value>_maxVal,
         _overflow = ( _tooSmall || _tooBig );
-    
+
     // -- The value is ok, just return it as it is ++
     if (!_overflow) {
       return _value;
     }
-    
-    
+
+
     /// -- Handle the overflow condition: ++
-    
+
     // -- Wrap around uses min/max as new value as either is reached ++
     if (_options.wrapAround) {
       if (_tooSmall) {
@@ -72,9 +72,9 @@ HStepper = HControl.extend({
     else {
       return _this.value;
     }
-    
+
   },
-  
+
 /** Adds the step size to the value
   **/
   stepUp: function(){
@@ -84,7 +84,7 @@ HStepper = HControl.extend({
       )
     );
   },
-  
+
 /** Subtracts the step size from the value
   **/
   stepDown: function(){
@@ -94,22 +94,22 @@ HStepper = HControl.extend({
       )
     );
   },
-  
+
   // -- Background-offset of the state images up/down,
   // overrideable in the html template ++
   bgStateUp: '0px -23px',
   bgStateDown: '0px -46px',
-  
+
   // enables the up/down effect in the image based on the _up boolean (true means up, false means down)
   _bgStateOn: function( _up ){
     ELEM.setStyle(this.markupElemIds.state,'background-position',_up?this.bgStateUp:this.bgStateDown);
   },
-  
+
   // reverts the up/down effect
   _bgStateOff: function(){
     ELEM.setStyle(this.markupElemIds.state,'background-position','');
   },
-  
+
   // Starts the repeating stepping up or down (when the mouse button or a arrow key is down)
   _setRepeatInterval: function( _up ){
     var _this    = this,
@@ -122,13 +122,13 @@ HStepper = HControl.extend({
       _options.repeatInterval
     );
   },
-  
+
   // Stops the repeating stepping up or down enabled in _setRepeatInterval
   _clearRepeatInterval: function(){
     this._bgStateOff();
     clearInterval( this._repeatInterval );
   },
-  
+
   /** Checks where the mouseDown happened and adjusts the stepper up/down based on that
     **/
   mouseDown: function( x, y ){
@@ -136,25 +136,25 @@ HStepper = HControl.extend({
     this._setRepeatInterval(  ( y - this.pageY() ) <= 11  );
     return true;
   },
-  
+
   /** Stops the repeating stepping, when the mouse button goes up
     **/
   mouseUp: function(){
     this._clearRepeatInterval();
     return true;
   },
-  
+
   click: function(){
     this.mouseUp();
     return true;
   },
-  
+
   /** Stops the repeating stepping, when the control becomes inactive
     **/
   blur: function(){
     this._clearRepeatInterval();
   },
-  
+
 /** adjusts stepping up/down based on the arrow key pressed.
   * up and right arrow keys steps the value up, down and left steps the value down
   **/
@@ -183,20 +183,20 @@ HStepper = HControl.extend({
     }
     return true;
   },
-  
+
 /** stops the repeating when a key goes up
   **/
   keyUp: function(){
     this._clearRepeatInterval();
     return true;
   },
-  
+
 /** steps the value up/down based on the mouse scroll wheel
   **/
   mouseWheel: function(_delta) {
     (_delta>0)?this.stepUp():this.stepDown();
     return true;
   }
-  
-  
+
+
 });

data/client/js/controls/stringview/stringview.js

@@ -1,10 +1,10 @@
 
 /*** = Description
-  ** HStringView is a view component that represents a non-editable line of text. 
-  ** Commonly, stringview is used as a label to control elements 
-  ** that do not have implicit labels (text fields, checkboxes and radio buttons, and menus). 
-  ** Some form controls automatically have labels associated with them (press buttons) 
-  ** while most do not have (text fields, checkboxes and radio buttons, and sliders etc.).  
+  ** HStringView is a view component that represents a non-editable line of text.
+  ** Commonly, stringview is used as a label to control elements
+  ** that do not have implicit labels (text fields, checkboxes and radio buttons, and menus).
+  ** Some form controls automatically have labels associated with them (press buttons)
+  ** while most do not have (text fields, checkboxes and radio buttons, and sliders etc.).
   **
   ** = Instance variables
   ** +type+::   '[HStringView]'
@@ -16,10 +16,12 @@ var HStringView, HLabel;
   var _HStringViewInterface = {
 
     componentName: "stringview",
-    
+
     // allows text selection
     textSelectable: true,
 
+    optimizeWidthOnRefresh: true,
+
   /** = Description
     * The setStyle method of HStringView applies only to the value
     * element (not the whole component).
@@ -32,7 +34,7 @@ var HStringView, HLabel;
       this.setStyleOfPart( 'value', _name, _value, _cacheOverride);
       return this;
     },
-    
+
   /** = Description
     * The refreshLabel of HStringView sets a tool tip.
     * Applied by the setLabel method and the label attribute of options.
@@ -47,6 +49,16 @@ var HStringView, HLabel;
           this.setMarkupOfPart( 'value', this.label );
         }
       }
+    },
+
+    labelPadding: 0,
+    optimizeWidth: function(){
+      var _labelWidth = this.stringWidth((this.value || this.label),null,this.markupElemIds.value);
+      _labelWidth += this.labelPadding;
+      if( this.rect.width !== _labelWidth ){
+        this.rect.setWidth(_labelWidth);
+        this.drawRect();
+      }
     }
   };
 
@@ -55,7 +67,7 @@ var HStringView, HLabel;
     defaultEvents: {
       contextMenu: true
     },
-    
+
   /** = Description
     * HStringView allows the default contextMenu action.
     *

data/client/js/controls/tab/tab.js

@@ -35,17 +35,12 @@ HTab = HControl.extend({
   refreshOnValueChange: true,
   refreshOnLabelChange: false,
 
-  controlDefaults: (HControlDefaults.extend({
-    constructor: function(_ctrl){
-      this.tabInit(_ctrl);
-    },
-    tabInit: function(_ctrl){
-      _ctrl.tabs = [];
-      _ctrl.tabLabels = [];
-      _ctrl.tabLabelBounds = [];
-      _ctrl.tabLabelStrings = [];
-    }
-  })),
+  customOptions: function(_options){
+    this.tabs = [];
+    this.tabLabels = [];
+    this.tabLabelBounds = [];
+    this.tabLabelStrings = [];
+  },
 
   rightmostPx: 0,
   selectIdx: -1,
@@ -60,7 +55,10 @@ HTab = HControl.extend({
   tabLabelRightEdge: 4,
 
   // overridden in the template
-  fontStyle: 'font-family: Helvetica, Arial, sans-serif;font-size:13px;',
+  fontStyle: {
+    fontFamily: 'Helvetica, Arial, sans-serif',
+    fontSize: '13px'
+  },
 
   tabLabelHTMLPrefix1: '<div class="edge_left"></div><div class="tablabel" style="width:',
   tabLabelHTMLPrefix2: 'px">',
@@ -69,7 +67,7 @@ HTab = HControl.extend({
   tabLabelElementTagName: 'div',
   tabLabelAlign: 'left',
   tabLabelFillBg: false,
-  tabTriggerLink: true,
+  tabTriggerLink: false,
   tabLabelNoHTMLPrefix: false,
 
 /** = Description
@@ -77,14 +75,14 @@ HTab = HControl.extend({
   *
   **/
   refreshValue: function(){
-    var _value = this.value;
+    var _this = this;
     if(typeof _value === 'number'){
-      var _index = parseInt(_value,10);
-      if(_index<this.tabs.length){
-        if(_index!==this.selectIdx){
-          this.selectTab(_index);
+      this.pushTask( function(){
+        var _index = parseInt(_this.value,10);
+        if( _index < _this.tabs.length && _index !== _this.selectIdx){
+          _this.selectTab(_index);
         }
-      }
+      });
     }
   },
 
@@ -138,55 +136,51 @@ HTab = HControl.extend({
   **/
   addTab: function(_tabLabel,_doSelect,_viewClass,_viewClassOptions){
     var
-    _tabIdx=this.tabs.length,
+    _this = this,
+    _tabIdx = _this.tabs.length,
     _tabLabelHTML = '',
-    _labelTextWidth = this.stringWidth( _tabLabel, null, 0, this.fontStyle ),
-    _labelWidth = _labelTextWidth+this.tabLabelLeftEdge+this.tabLabelRightEdge,
-    _tabLabelElemId = ELEM.make(this.markupElemIds[this.tabLabelParentElem],this.tabLabelElementTagName),
+    _labelTextWidth = _this.stringWidth( _tabLabel, null, 0, _this.fontStyle ),
+    _labelWidth = _labelTextWidth+_this.tabLabelLeftEdge+_this.tabLabelRightEdge,
+    _tabLabelElemId = ELEM.make(_this.markupElemIds[_this.tabLabelParentElem],_this.tabLabelElementTagName),
     _tab;
     if( _viewClass === undefined ){
-      _tab = HTabView.nu( [0,this.tabLabelHeight,null,null,0,0], this);
+      _tab = HTabView.nu( [0,_this.tabLabelHeight,null,null,0,0], _this);
     }
     else {
-      _tab = _viewClass.nu( [0,this.tabLabelHeight,null,null,0,0], this, _viewClassOptions );
+      _tab = _viewClass.nu( [0,_this.tabLabelHeight,null,null,0,0], _this, _viewClassOptions );
     }
-    _tabIdx = this.tabs.length;
-    if(this.tabLabelNoHTMLPrefix){
+    _tabIdx = _this.tabs.length;
+    if(_this.tabLabelNoHTMLPrefix){
       _tabLabelHTML = _tabLabel;
     }
     else {
-      _tabLabelHTML = this.tabLabelHTMLPrefix1+_labelTextWidth+this.tabLabelHTMLPrefix2+_tabLabel+this.tabLabelHTMLSuffix;
+      _tabLabelHTML = _this.tabLabelHTMLPrefix1+_labelTextWidth+_this.tabLabelHTMLPrefix2+_tabLabel+_this.tabLabelHTMLSuffix;
     }
     _tab.hide();
     ELEM.addClassName(_tabLabelElemId,'item_bg');
     ELEM.setStyle(_tabLabelElemId,'width',_labelWidth+'px');
-    ELEM.setStyle(_tabLabelElemId,this.tabLabelAlign,this.rightmostPx+'px');
+    ELEM.setStyle(_tabLabelElemId,_this.tabLabelAlign,_this.rightmostPx+'px');
     ELEM.setHTML(_tabLabelElemId,_tabLabelHTML);
-    this.tabLabelStrings.push(_tabLabel);
-    if(this.tabTriggerLink&&this.tabLabelElementTagName==='a'){
-      ELEM.setAttr(_tabLabelElemId,'href','javascript:HSystem.views['+this.viewId+'].selectTab('+_tabIdx+');');
-    }
-    else if (this.tabTriggerLink && !BROWSER_TYPE.ie7){
-      var _this = this;
-      Event.observe( ELEM.get(_tabLabelElemId), 'click', function(){ _this.selectTab(_tabIdx); } );
-    }
-    else {
-      this.tabTriggerLink = false;
-      this.setClick(true);
-      this.tabLabelBounds.push([this.rightmostPx,this.rightmostPx+_labelWidth]);
-    }
-    this.rightmostPx+=_labelWidth;
-    if(this.tabLabelAlign === 'right'){
-      ELEM.setStyle(this.markupElemIds[this.tabLabelParentElem],'width',this.rightmostPx+'px');
-    }
-    else if (this.tabLabelFillBg) {
-      ELEM.setStyle(this.markupElemIds.state,'left',this.rightmostPx+'px');
-    }
-    this.tabs.push(_tab.viewId);
-    this.tabLabels.push(_tabLabelElemId);
+    _this.tabLabelStrings.push(_tabLabel);
+    if(_this.tabTriggerLink && !_this.isProduction){
+      console.log('HTab.options.tabTriggerLink is no longer supported')
+    }
+    _this.tabTriggerLink = false;
+    _this.setClick(true);
+    _this.tabLabelBounds.push([_this.rightmostPx,_this.rightmostPx+_labelWidth]);
+    _this.rightmostPx+=_labelWidth;
+    if(_this.tabLabelAlign === 'right'){
+      ELEM.setStyle(_this.markupElemIds[_this.tabLabelParentElem],'width',_this.rightmostPx+'px');
+    }
+    else if (_this.tabLabelFillBg) {
+      ELEM.setStyle(_this.markupElemIds.state,'left',_this.rightmostPx+'px');
+    }
+    _this.tabs.push(_tab.viewId);
+    _this.tabLabels.push(_tabLabelElemId);
     _tab.tabIndex = _tabIdx;
-    if(_doSelect || (this.value === _tabIdx)){
-      this.selectTab(_tabIdx);
+
+    if(_doSelect || (_this.value === _tabIdx)){
+      _this.selectTab(_tabIdx);
     }
     return _tab;
   },
@@ -195,26 +189,26 @@ HTab = HControl.extend({
   * click function
   *
   * = Parameters
-  * +_x+::
-  * +_y+::
+  * +x+::
+  * +y+::
   *
   **/
-  click: function(_x,_y){
+  click: function(x,y){
     if(this.tabTriggerLink){
       this.setClickable(false);
       return;
     }
-    _x -= this.pageX();
-    _y -= this.pageY();
-    if(_y<=this.tabLabelHeight){
+    x -= this.pageX();
+    y -= this.pageY();
+    if(y<=this.tabLabelHeight){
       if (this.tabLabelAlign === 'right') {
-        _x = this.rect.width - _x;
+        x = this.rect.width - x;
       }
-      if(_x<=this.rightmostPx){
+      if(x<=this.rightmostPx){
         var i=0,_labelBounds;
         for(i;i<this.tabLabelBounds.length;i++){
           _labelBounds = this.tabLabelBounds[i];
-          if(_x<_labelBounds[1] && _x>=_labelBounds[0]){
+          if(x<_labelBounds[1] && x>=_labelBounds[0]){
             this.selectTab(i);
             return;
           }
@@ -296,7 +290,7 @@ HTabItem = {
       _parent = _rect;
     }
     else {
-      console.warn && console.warn( "Warning: the rect constructor argument of HTabItem is deprecated." );
+      console.warn( "Warning: the rect constructor argument of HTabItem is deprecated." );
     }
     return _parent.addTab( _options.label, _options.select );
   },

data/client/js/controls/tab/themes/default/tab.html

@@ -8,6 +8,9 @@ ${#!coffee
   @tabLabelLeftEdge = ( @options.tabLabelLeftEdge or 12 )
   @tabLabelRightEdge = ( @options.tabLabelRightEdge or 9 )
   @tabLabelHeight = ( @options.tabLabelHeight or 24 )
-  @fontStyle = 'font-family:Helvetica,Arial,sans-serif;font-size:12px;font-weight:bold;'
+  @fontStyle =
+    fontFamily: 'Helvetica, Arial, sans-serif'
+    fontSize: '12px'
+    fontWeight: 'bold'
   @tabLabelFillBg = true
 }

data/client/js/controls/textcontrol/textcontrol.coffee

@@ -25,7 +25,8 @@ HTextControl = HControl.extend
       textIndent: 0
       fontSize: '10px'
       color: '#666'
-    refreshAfter:   0.2 # 200ms
+    labelWidth: 'auto'
+    refreshAfter:   0.0 # amount of milliseconds to wait for a refresh from the input field
     refreshOnBlur:  true
     refreshOnInput: true
     refreshOnIdle:  true
@@ -56,7 +57,10 @@ HTextControl = HControl.extend
         label: @label
         style: @options.labelStyle
       )
-    _labelWidth = @_labelView.stringWidth( @label, null, @_labelView.markupElemIds.value )+4
+    if @options.labelWidth == 'auto'
+      _labelWidth = @_labelView.stringWidth( @label, null, @_labelView.markupElemIds.value )+4
+    else
+      _labelWidth = @options.labelWidth
     @_labelView.rect.setWidth( _labelWidth )
     @_labelView.drawRect()
     if @componentName == 'textarea'
@@ -286,10 +290,16 @@ HTextControl = HControl.extend
     else if _inputElement.selectionStart
       _inputElement.setSelectionRange( _selectionStart, _selectionEnd )
 
+  defaultKey: ->
+    @refreshAfter()
+    null
+
   ### = Description
   ## Receives the +textEnter+ event to update the value
   ## based on what's (potentially) entered in the text input field.
   ###
   textEnter: ->
     @refreshAfter() if @options.refreshOnInput
-    return false
+    false
+
+HTextField = HTextControl

data/client/js/controls/validatorview/validatorview.js

@@ -2,10 +2,10 @@
 var//RSence.Controls
 HValidatorView = HControl.extend({
 
-  controlDefaults: (HControlDefaults.extend({
+  controlDefaults: HControlDefaults.extend({
     value: false,
     valueField: false
-  })),
+  }),
 
   setRect: function(_rect) {
     var _options = this.options;
@@ -19,7 +19,7 @@ HValidatorView = HControl.extend({
     }
     this.base(_rect);
   },
-  
+
 /** = Description
   * Ensures the value set is a Boolean.
   *
@@ -51,5 +51,5 @@ HValidatorView = HControl.extend({
     ELEM.setStyle(_elemId,'background-position',_x+'px '+_y+'px');
   }
 
-  
+
 });