rsence 2.1.11 → 2.2.0

data/js/controls/searchfield/themes/default/searchfield.html

@@ -0,0 +1,12 @@
+<div class="searchfield_w"></div>
+<div class="searchfield_c"></div>
+<div class="searchfield_e"></div>
+
+<div id="label#{_ID}" title="#{this.label}" class="searchfield_input_parent">
+  <input type="text" class="searchfield_input" #{this.enabled?'':'disabled'}
+    onfocus="HSystem.views[#{this.viewId}].textFocus();" 
+    onblur="HSystem.views[#{this.viewId}].textBlur();" 
+    id="value#{_ID}" value="#{this.value}" />
+</div>
+
+<div class="searchfield_fade"></div>

data/js/controls/sliders/slider/slider.js

@@ -44,6 +44,7 @@ HSlider = HControl.extend({
   controlDefaults: (HControlDefaults.extend({
     minValue: 0,
     maxValue: 1,
+    roundValue: false,
     inverseAxis: false
   })),
   
@@ -66,7 +67,12 @@ HSlider = HControl.extend({
     if (_value > this.maxValue) {
       _value = this.maxValue;
     }
-    this.base(_value);
+    if( this.options.roundValue ){
+      this.base( Math.round( _value ) );
+    }
+    else {
+      this.base(_value);
+    }
     if(this._thumbElemId){
       this.drawThumbPos();
     }

data/js/controls/stepper/stepper.js

@@ -141,17 +141,19 @@ HStepper = HControl.extend({
   mouseDown: function( x, y ){
     this.setMouseUp(true);
     this._setRepeatInterval(  ( y - ELEM.getVisiblePosition( this.elemId )[1] ) <= 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
@@ -186,18 +188,21 @@ HStepper = HControl.extend({
     else if (_keyCode === Event.KEY_PAGEDOWN) {
       this._setRepeatInterval( 0 );
     }
+    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/js/controls/stringview/stringview.js

@@ -17,47 +17,58 @@
   ** +type+::   '[HStringView]'
   ** +value+::  The string that this string view displays when drawn.
   ***/
-var//RSence.Controls
-HStringView = HControl.extend({
+var HStringView, HLabel;
 
-  componentName: "stringview",
-  
-  defaultEvents: {
-    contextMenu: true
-  },
-  
-/** = Description
-  * HStringView allows the default contextMenu action.
-  *
-  **/
-  contextMenu: function(){
-    return true;
-  },
-  
-/** = Description
-  * The setStyle method of HStringView applies only to the value 
-  * element (not the whole component).
-  *
-  **/
-  setStyle: function(_name, _value, _cacheOverride) {
-    if (!this['markupElemIds']||!this.markupElemIds['value']) {
+(function(){
+  var _HStringViewInterface = {
+
+    componentName: "stringview",
+
+  /** = Description
+    * The setStyle method of HStringView applies only to the value
+    * element (not the whole component).
+    *
+    **/
+    setStyle: function(_name, _value, _cacheOverride) {
+      if (!this['markupElemIds']||!this.markupElemIds['value']) {
+        return this;
+      }
+      this.setStyleOfPart( 'value', _name, _value, _cacheOverride);
       return this;
-    }
-    ELEM.setStyle(this.markupElemIds.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.
-  *
-  **/
-  refreshLabel: function() {
-    if(this.markupElemIds) {
-      if(this.markupElemIds.value) {
-        ELEM.setAttr(this.markupElemIds.value, 'title', this.label);
+    },
+    
+  /** = Description
+    * The refreshLabel of HStringView sets a tool tip.
+    * Applied by the setLabel method and the label attribute of options.
+    *
+    **/
+    refreshLabel: function() {
+      if(this.markupElemIds) {
+        if(this.markupElemIds.value) {
+          if( this.value !== undefined ){
+            this.setAttrOfPart( 'value', 'title', this.label );
+          }
+          else {
+            this.setMarkupOfPart( 'value', this.label );
+          }
+        }
       }
     }
-  }
-});
+  };
+
+  HLabel = HView.extend( _HStringViewInterface );
+  HStringView = HControl.extend( _HStringViewInterface ).extend({
+    defaultEvents: {
+      contextMenu: true
+    },
+    
+  /** = Description
+    * HStringView allows the default contextMenu action.
+    *
+    **/
+    contextMenu: function(){
+      return true;
+    }
+  });
 
+})();

data/js/controls/tab/tab.js

@@ -143,13 +143,20 @@ HTab = HControl.extend({
   * +_doSelect+::
   *
   **/
-  addTab: function(_tabLabel,_doSelect,_viewClass){
-    var _tabIdx=this.tabs.length,
-        _tabLabelHTML = '',
-        _labelTextWidth = this.stringWidth( _tabLabel, null, 0, this.fontStyle ),
-        _labelWidth = _labelTextWidth+this.tabLabelLeftEdge+this.tabLabelRightEdge,
-        _tab = HTabView.nu( [0,this.tabLabelHeight,null,null,0,0] ,this),
-        _tabLabelElemId = ELEM.make(this.markupElemIds[this.tabLabelParentElem],this.tabLabelElementTagName);
+  addTab: function(_tabLabel,_doSelect,_viewClass,_viewClassOptions){
+    var
+    _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),
+    _tab;
+    if( _viewClass === undefined ){
+      _tab = HTabView.nu( [0,this.tabLabelHeight,null,null,0,0], this);
+    }
+    else {
+      _tab = _viewClass.nu( [0,this.tabLabelHeight,null,null,0,0], this, _viewClassOptions );
+    }
     _tabIdx = this.tabs.length;
     if(this.tabLabelNoHTMLPrefix){
       _tabLabelHTML = _tabLabel;
@@ -273,8 +280,97 @@ HTab = HControl.extend({
 var//RSence.Controls
 HTabItem = {
   nu: function(_rect, _parent, _options){
+    if( _rect.hasAncestor && _rect.hasAncestor( HView ) ){
+      _options = _parent;
+      _parent = _rect;
+    }
+    else {
+      console.warn && console.warn( "Warning: the rect constructor argument of HTabItem is deprecated." );
+    }
     return _parent.addTab( _options.label, _options.select );
   }
 };
 
+var//RSence.Controls
+GUITreeTabView = HControl.extend({
+  controlDefaults: HControlDefaults.extend({
+    visible: false,
+    autoCreate: false,
+    autoDestroy: true
+  }),
+  jsonRenderer: false,
+  createJSONRenderer: function(){
+    var
+    _this = this,
+    _value = _this.value,
+    _progressView = HView.nu( [4,0, 150, 34, 0, null], _this ),
+    // _indicatorPhases = ['/','-','\\','|','/','-','\\','|'], // ascii
+    // _indicatorPhases = ['◴','◷','◶','◵'], // unicode sector ball
+    // _indicatorPhases = ['◑','◒','◐','◓'], // unicode half ball
+    // _indicator = HStringView.nu( [ 2, 2, 32, 32 ], _progressView, { value: _indicatorPhases[0], style: { 'font-size': '24px' } } ),
+    // _indicatorTimeout = setInterval( function(){
+    //   _indicatorPhase = _indicatorPhases.shift();
+    //   _indicatorPhases.push( _indicatorPhase );
+    //   _indicator.setValue( _indicatorPhase );
+    // }, 100 ),
+    _indicatorStr = HStringView.nu( [ 34, 12, 100, 20, 4, null ], _progressView, { value: 'Rendering' } );
+    _this.destroyJSONRenderer();
+    if( _value.type === undefined || _value.version === undefined ){
+      _value = {
+        'type': 'GUITree',
+        'version': 0.9,
+        'class': 'HView',
+        'rect': [0,0, null,null, 0,0],
+        'options': { 'style': { 'overflow': 'auto' } },
+        'subviews': _value
+      };
+    }
+    setTimeout( function(){
+      _this.jsonRenderer = JSONRenderer.nu( _value, _this );
+      // clearTimeout( _indicatorTimeout );
+      _progressView.die();
+    }, 10 );
+  },
+  destroyJSONRenderer: function(){
+    if( this.jsonRenderer ){
+      this.jsonRenderer.die();
+      this.jsonRenderer = false;
+    }
+  },
+  drawSubviews: function(){
+    if( this.options.autoCreate ){
+      this.createJSONRenderer();
+    }
+  },
+  show: function(){
+    this.base();
+    if(!this.jsonRenderer){
+      this.createJSONRenderer();
+    }
+  },
+  hide: function(){
+    this.base();
+    if( this.options.autoDestroy ){
+      this.destroyJSONRenderer();
+    }
+  },
+  die: function(){
+    this.destroyJSONRenderer();
+    this.base();
+  }
+});
+
+var//RSence.Controls
+GUITreeTabItem = {
+  nu: function( _rect, _parent, _options ){
+    if( _rect.hasAncestor && _rect.hasAncestor( HView ) ){
+      _options = _parent;
+      _parent = _rect;
+    }
+    else {
+      console.warn && console.warn( "Warning: the rect constructor argument of GUITreeTabItem is deprecated." );
+    }
+    return _parent.addTab( _options.label, _options.select, GUITreeTabView, _options );
+  }
+};
 

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

@@ -68,10 +68,12 @@
 .tab_bg {
   position: absolute;
   top: 24px; left: 0px; right: 0px; bottom: 0px;
+  border-radius: 0 0 3px 3px;
   background-image: #{this.getCssFilePath('tab_border_pattern.png')};
 }
 .tab_fg {
   position: absolute;
   top: 0px; left: 1px; right: 1px; bottom: 1px;
+  border-radius: 0 0 3px 3px;
   background-image: #{this.getCssFilePath('tab_bg_color.png')};
 }

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

@@ -14,6 +14,10 @@
 .default .disabled .textarea_input {
   #{(BROWSER_TYPE.safari||BROWSER_TYPE.chrome)?'color:#ccc;':'color:#999'}
 }
+.default .textarea_input:focus {
+  outline-color: transparent;
+  outline-style: none;
+}
 
 .default .textarea_input_parent {
   position: absolute;

data/js/controls/textcontrol/textcontrol.js

@@ -28,9 +28,21 @@ HTextControl = HControl.extend({
   
   controlDefaults: (HControlDefaults.extend({
     refreshOnBlur: true,
-    refreshOnInput: true
+    refreshOnInput: true,
+    focusOnCreate: false
   })),
   
+  drawSubviews: function(){
+    ELEM.setStyle(this.elemId,'overflow','visible');
+    this.base();
+    if(this.options.focusOnCreate){
+      this.getInputElement().focus();
+      if( typeof this.value === 'string' ){
+        this.setSelectionRange( this.value.length, this.value.length );
+      }
+    }
+  },
+  
 /** = Description
   * The contextMenu event for text input components is not prevented by default.
   **/
@@ -50,6 +62,13 @@ HTextControl = HControl.extend({
       }
     }
   },
+
+  lostActiveStatus: function(){
+    if(this['markupElemIds']!==undefined){
+      ELEM.get( this.markupElemIds.value ).blur();
+      this.textBlur();
+    }
+  },
   
   setStyle: function(_name, _value, _cacheOverride) {
     if (!this['markupElemIds']||!this.markupElemIds['value']) {
@@ -118,6 +137,7 @@ HTextControl = HControl.extend({
   *
   **/
   textFocus: function(){
+    EVENT.changeActiveControl( this );
     this.hasTextFocus = true;
     this._setChangeEventFn();
     return true;
@@ -140,7 +160,14 @@ HTextControl = HControl.extend({
   
   onIdle: function(){
     this.hasTextFocus && this._updateValueFromField();
-    this.base();
+    try{
+      this.base();
+    }
+    catch(e){
+      console.error('HTextControl::onIdle error -> ',e);
+      debugger;
+      this.base();
+    }
   },
   
 /** = Description
@@ -208,6 +235,9 @@ HTextControl = HControl.extend({
   },
   
   die: function(){
+    if( this.hasTextFocus ){
+      this.getInputElement().blur();
+    }
     this._clearChangeEventFn();
     this.base();
   },

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

@@ -9,11 +9,16 @@
   vertical-align: middle;
   border: 0px;
   left: 0px; top: 0px;
-  #{(BROWSER_TYPE.firefox||BROWSER_TYPE.ie7||BROWSER_TYPE.ie8||BROWSER_TYPE.opera)?'padding-left:2px;width:100% !important;height:90% !important;':BROWSER_TYPE.ie6?'right:4px;bottom:2px;':'padding:2px;right:0px;bottom:0px;width:auto;height:auto;'}
+  #{(BROWSER_TYPE.firefox||BROWSER_TYPE.ie7||BROWSER_TYPE.ie8||BROWSER_TYPE.ie9||BROWSER_TYPE.opera)?'padding-left:2px;width:100% !important;height:90% !important;':BROWSER_TYPE.ie6?'right:4px;bottom:2px;':'padding:2px;right:0px;bottom:0px;width:auto;height:auto;'}
+}
+
+.default .textcontrol_input:focus {
+  outline-color: transparent;
+  outline-style: none;
 }
 
 .default .disabled .textcontrol_input {
-  color: #999;
+  color: #ccc;
 }
 
 .default .textcontrol_input_parent {
@@ -28,6 +33,16 @@
   #{BROWSER_TYPE.ie6?'font-size:0;line-height:0;':''}
 }
 
+.default .active>.textcontrol_bg {
+  left: 0px; top: 0px; right: 0px; bottom: 0px;
+  -moz-box-shadow: 0px 0px 3px #333;
+  -webkit-box-shadow: 0px 0px 3px #333;
+  box-shadow: 0px 0px 3px #333;
+}
+
+.default .disabled .textcontrol_bg {
+  background-color: #eee;
+}
 
 
 .default .textcontrol_ne,

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

@@ -80,13 +80,13 @@
   background-position: 0px -96px;
 }
 .disabled > .uploader > .button_control > .button_edge_right {
-  background-position: -24px -144px;
+  background-position: -42px -144px;
 }
 .enabled > .uploader:hover > .button_control > .button_edge_right {
-  background-position: -24px -48px;
+  background-position: -42px -48px;
 }
 .enabled > .uploader:active > .button_control > .button_edge_right {
-  background-position: -24px -96px;
+  background-position: -42px -96px;
 }
 .disabled > .uploader > .button_control > .button_center {
   background-position: 0px -168px;