rsence-pre 2.2.0.18 → 2.2.0.19

data/VERSION

@@ -1 +1 @@
-2.2.0.18.pre
+2.2.0.19.pre

data/conf/default_conf.yaml

@@ -267,6 +267,7 @@
         - textcontrol       # HTextControl
         - passwordcontrol   # HPasswordControl
         - textarea          # HTextArea
+        - searchfield       # HSearchField
         - uploader          # HUploader
         - slider            # HSlider
         - vslider           # HVSlider

data/js/controls/searchfield/searchfield.coffee

@@ -0,0 +1,2 @@
+HSearchField = HTextControl.extend
+  componentName: 'searchfield'

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

@@ -0,0 +1,96 @@
+
+.default .searchfield_input {
+  position: absolute;
+  display: block;
+  font-family: Arial, sans-serif;
+  font-size: 13px;
+  color: #000;
+  background-color: transparent;
+  vertical-align: middle;
+  border: 0px;
+  left: 18px; top: 4px;
+  line-height: 18px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  #{(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:3px;height:16px;':'padding:2px;padding-top:4px;right:3px;height:16px;width:auto;'}
+}
+
+.default .searchfield_input:focus {
+  outline-color: transparent;
+  outline-style: none;
+}
+
+.default .disabled .searchfield_input {
+  color: #ccc;
+}
+
+.default .searchfield_input_parent {
+  position: absolute;
+  #{(BROWSER_TYPE.firefox||BROWSER_TYPE.ie7||BROWSER_TYPE.ie8||BROWSER_TYPE.ie9||BROWSER_TYPE.opera)?'left:0;padding-left:1px;top:0;right:4px;bottom:0;':BROWSER_TYPE.ie6?'left:2px;top:1px;right:1px;height:20px;':'left:-2px;top:-2px;right:-2px;height:20px;'}
+}
+
+.default .searchfield_fade,
+.default .searchfield_e,
+.default .searchfield_w,
+.default .searchfield_c {
+  position: absolute;
+  height: 24px;
+  background-repeat: no-repeat;
+  background-image: #{this.getCssFilePath('searchfield_parts1.png')};
+  #{BROWSER_TYPE.ie6?'font-size:0;line-height:0;':''}
+}
+
+.default .searchfield_fade {
+  right: 0px; top: 0px; width: 10px;
+  background-position: -48px 0px;
+}
+
+.default .searchfield_e {
+  right: 0px; top: 0px; width: 24px; 
+  background-position: -24px 0px;
+}
+
+.default .searchfield_c {
+  left: 24px; right: 24px; top: 0px;
+  background-repeat: repeat-x;
+  background-position: 0px -24px;
+}
+
+.default .searchfield_w {
+  left: 0px; top: 0px; width: 24px; 
+  background-position: 0px 0px;
+}
+
+.default .disabled > .searchfield_fade {
+  background-position: -48px -96px;
+}
+
+.default .disabled > .searchfield_e {
+  background-position: -24px -96px;
+}
+
+.default .disabled > .searchfield_c {
+  background-position: 0px -120px;
+}
+
+.default .disabled > .searchfield_w {
+  background-position: 0px -96px;
+}
+
+.default .active > .searchfield_fade {
+  background-position: -48px -48px;
+}
+
+.default .active > .searchfield_e {
+  background-position: -24px -48px;
+}
+
+.default .active > .searchfield_c {
+  background-position: 0px -72px;
+}
+
+.default .active > .searchfield_w {
+  background-position: 0px -48px;
+}
+

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/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

@@ -33,6 +33,7 @@ HTextControl = HControl.extend({
   })),
   
   drawSubviews: function(){
+    ELEM.setStyle(this.elemId,'overflow','visible');
     this.base();
     if(this.options.focusOnCreate){
       this.getInputElement().focus();
@@ -61,6 +62,11 @@ HTextControl = HControl.extend({
       }
     }
   },
+
+  lostActiveStatus: function(){
+    ELEM.get( this.markupElemIds.value ).blur();
+    this.textBlur();
+  },
   
   setStyle: function(_name, _value, _cacheOverride) {
     if (!this['markupElemIds']||!this.markupElemIds['value']) {
@@ -129,6 +135,7 @@ HTextControl = HControl.extend({
   *
   **/
   textFocus: function(){
+    EVENT.changeActiveControl( this );
     this.hasTextFocus = true;
     this._setChangeEventFn();
     return true;
@@ -151,7 +158,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

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

@@ -12,6 +12,11 @@
   #{(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;'}
 }
 
+.default .textcontrol_input:focus {
+  outline-color: transparent;
+  outline-style: none;
+}
+
 .default .disabled .textcontrol_input {
   color: #ccc;
 }
@@ -28,6 +33,13 @@
   #{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;
 }

data/js/core/class/class.js

@@ -70,7 +70,7 @@ HClass.prototype = {
  /* The property copying method. */
   extend: function(_source, _value) {
     var _extend = HClass.prototype.extend,
-        _ancestor, _method, _previous, _returnValue, i, _name, _prototype, _protected;
+        _ancestor, _method, _returnValue, i, _name, _prototype, _protected;
     if (arguments.length === 2) {
       _ancestor = this[_source];
       // only methods are inherited
@@ -79,7 +79,7 @@ HClass.prototype = {
         _method = _value;
         _value = function() {
           // saves the this.base that is the this.base method of this child
-          _previous = this.base;
+          var _previous = this.base;
           // copies previous this.base from the direction from HClass
           this.base = _ancestor;
           // current class's method is called
@@ -129,6 +129,7 @@ HClass.prototype = {
         } )
       )( arguments );
     };
+    this['new'] = this.nu;
     return this;
   },
   /** = Description

data/js/datetime/datetimepicker/datetimepicker.js

@@ -105,6 +105,7 @@ HDateTimePicker = HControl.extend({
     this.base();
   },
   drawSubviews: function(){
+    ELEM.setStyle( this.elemId, 'overflow', 'visible' );
     var
     _NumStepperField = HView.extend({
       setEnabled: function(_state){
@@ -118,6 +119,7 @@ HDateTimePicker = HControl.extend({
         }
       },
       drawSubviews: function(){
+        ELEM.setStyle( this.elemId, 'overflow', 'visible' );
         this.numField = HNumericTextControl.extend({
           refreshValue: function(){
             this.base();

data/js/foundation/json_renderer/json_renderer.js

@@ -24,7 +24,7 @@
 //var//RSence.Foundation
 COMM.JSONRenderer = HClass.extend({
   
-  version: 0.8,
+  version: 0.9,
 
 /** = Description
   * Renders JSON structured data, see some of the demos for usage examples.
@@ -52,21 +52,23 @@ COMM.JSONRenderer = HClass.extend({
     this.view.die();
   },
   defineInScope: function( _definition ){
-    var _isArr = (_definition instanceof Array),
-        _isObj = (_definition instanceof Object);
+    var
+    _isArr = (_definition instanceof Array),
+    _isObj = (_definition instanceof Object);
     if( _isArr || !_isObj ){
       console.log("JSONRenderer; definition must be an Object, got: '"+(typeof _definition)+"'. Definition: ",_definition);
       return;
     }
-    var _extension = {},
-        _reserved = ['class','extend','implement'],
-        _className = _definition[_reserved[0]],
-        _extendName = _definition[_reserved[1]],
-        _implementName = _definition[_reserved[2]],
-        _extend = _extendName?this.findInScope(_extendName):false,
-        _implement = _implementName?this.findInScope(_implementName):false,
-        _scope = this.scopes[ this.scopeDepth ],
-        _key, _value;
+    var
+    _extension = {},
+    _reserved = ['class','extend','implement'],
+    _className = _definition[_reserved[0]],
+    _extendName = _definition[_reserved[1]],
+    _implementName = _definition[_reserved[2]],
+    _extend = _extendName?this.findInScope(_extendName):false,
+    _implement = _implementName?this.findInScope(_implementName):false,
+    _scope = this.scopes[ this.scopeDepth ],
+    _key, _value;
     if( _className === undefined ) {
       console.log("JSONRenderer; class name missing in definition scope.");
       return;
@@ -96,10 +98,11 @@ COMM.JSONRenderer = HClass.extend({
       return false;
     }
     if(_className.indexOf('.') !== -1){
-      var _splitClass = _className.split('.'),
-          j = 1,
-          _classPart = _splitClass[0],
-          _classFull = this.findInScope( _classPart );
+      var
+      _splitClass = _className.split('.'),
+      j = 1,
+      _classPart = _splitClass[0],
+      _classFull = this.findInScope( _classPart );
       if( !_classFull ){
         return false;
       }
@@ -130,42 +133,102 @@ COMM.JSONRenderer = HClass.extend({
     }
     return _block;
   },
+  initStraight: function( _class, _args ){
+    if( _args instanceof Array ){
+      return HClass.extend().nu.apply( _class, _args );
+    }
+    else {
+      return (new _class(_args));
+    }
+  },
   renderNode: function( _dataNode, _parent ){
-    var // Currently only window-level classes are supported
-        _className = _dataNode['class'],
-        _class = this.findInScope( _className ),
-        
-        // Currently only HView -derived classes are supported, so 
-        // the rect is mandatory.
-        _rect = _dataNode['rect'],
-        _hasRect = (_rect !== undefined) && (_rect instanceof Array || typeof _rect === 'string'),
-        
-        // Checks, if any sub-views are defined.
-        _hasSubviews = _dataNode['subviews'] !== undefined,
-        _subViews    = _hasSubviews?_dataNode['subviews']:null,
-        
-        // Checks, if any options are defined.
-        _hasOptions  = _dataNode['options'] !== undefined,
-        _options     = _hasOptions?_dataNode['options']:null,
-        
-        // JS Extension block
-        _hasExtension = _dataNode['extend'] !== undefined,
-        _extension    = _hasExtension?_dataNode['extend']:null,
-        
-        // JS Extension block
-        _hasBind = _dataNode['bind'] !== undefined,
-        _bind    = _hasBind?_dataNode['bind']:null,
-        
-        // JS Definition block
-        _hasDefinition = _dataNode['define'] !== undefined,
-        _definitions   = _hasDefinition?_dataNode['define']:null,
-        
-        // The HView-derived class instance, instance is by default the parent
-        _instance = _parent,
-        
-        i,
-        
-        _subView;
+    var
+    _reserved = [ 'type', 'args', 'version', 'class', 'rect', 'bind', 'extend', 'options', 'subviews', 'define' ],
+    _className, _class, _origNode, _straightParams = false, _rect, _hasRect, _hasSubviews, _subViews,
+    _hasOptions, _options, _hasExtension, _extension, _hasBind, _bind,
+    _hasDefinition, _definition, _instance, i, _subView = null;
+
+    // The name of the class:
+    if( !_dataNode['class'] ){
+
+      for( i in _dataNode ){
+        if( _reserved.indexOf( i ) === -1 ){
+          _className = i;
+          _origNode = _dataNode;
+          _dataNode = _dataNode[i];
+          break;
+        }
+      }
+      _straightParams = ( !(_dataNode instanceof Object) || (_dataNode instanceof Array) );
+    }
+    else {
+      _className = _dataNode['class'];
+    }
+
+    _class = this.findInScope( _className );
+
+    if( _straightParams ){
+      return this.initStraight( _class, _dataNode );
+    }
+    else if( _dataNode['args'] !== undefined ){
+      return this.initStraight( _class, _dataNode['args'] );
+    }
+    else if( _origNode && _origNode['args'] !== undefined ){
+      return this.initStraight( _class, _origNode['args'] );
+    }
+    
+    // Currently only HView -derived classes are supported, so 
+    // the rect is mandatory.
+    _rect = _dataNode['rect'];
+    _hasRect = (_rect !== undefined) && (_rect instanceof Array || typeof _rect === 'string');
+    if( !_hasRect && _origNode){
+      _hasRect = _origNode['rect'] !== undefined;
+      _rect    = _hasRect?_origNode['rect']:null;
+    }
+    
+    // Checks, if any sub-views are defined.
+    _hasSubviews = _dataNode['subviews'] !== undefined;
+    _subViews    = _hasSubviews?_dataNode['subviews']:null;
+    if( !_hasSubviews && _origNode){
+      _hasSubviews = _origNode['subviews'] !== undefined;
+      _subViews    = _hasSubviews?_origNode['subviews']:null;
+    }
+    
+    // Checks, if any options are defined.
+    _hasOptions  = _dataNode['options'] !== undefined;
+    _options     = _hasOptions?_dataNode['options']:null;
+    if( !_hasOptions && _origNode){
+      _hasOptions = _origNode['options'] !== undefined;
+      _options    = _hasOptions?_origNode['options']:null;
+    }
+    
+    // JS Extension block
+    _hasExtension = _dataNode['extend'] !== undefined;
+    _extension    = _hasExtension?_dataNode['extend']:null;
+    if( !_hasExtension && _origNode){
+      _hasExtension = _origNode['extend'] !== undefined;
+      _extension    = _hasExtension?_origNode['extend']:null;
+    }
+    
+    // JS Extension block
+    _hasBind = _dataNode['bind'] !== undefined;
+    _bind    = _hasBind?_dataNode['bind']:null;
+    if( !_hasBind && _origNode){
+      _hasBind = _origNode['bind'] !== undefined;
+      _bind    = _hasBind?_origNode['bind']:null;
+    }
+    
+    // JS Definition block
+    _hasDefinition = _dataNode['define'] !== undefined;
+    _definitions   = _hasDefinition?_dataNode['define']:null;
+    if( !_hasDefinition && _origNode){
+      _hasDefinition  = _origNode['define'] !== undefined;
+      _definitions    = _hasDefinition?_origNode['define']:null;
+    }
+    
+    // The HView-derived class instance, instance is by default the parent
+    _instance = _parent;
+    
     this.scopeDepth ++;
     this.scopes.push({});
     try{
@@ -200,12 +263,19 @@ COMM.JSONRenderer = HClass.extend({
         }
         if(_hasOptions){
           if(_hasBind){
-            _options.valueObj = COMM.Values.values[_bind];
+            if( _bind instanceof HValue ){
+              _options.valueObj = _bind;
+            }
+            else if( COMM.Values.values[_bind] !== undefined ){
+              _options.valueObj = COMM.Values.values[_bind];
+            }
+            else {
+              console.log('renderNode warning; No such valueId:'+_bind);
+            }
           }
           else{
             if(_options['valueObjId'] !== undefined){
-              var _valueObjId = _options['valueObjId'];
-              _options['valueObj'] = COMM.Values.values[_options['valueObjId']];
+              _options.valueObj = COMM.Values.values[_options['valueObjId']];
             }
           }
         }
@@ -219,7 +289,15 @@ COMM.JSONRenderer = HClass.extend({
         }
         if(!_hasOptions){
           if(_hasBind){
-            COMM.Values.values[_bind].bind(_instance);
+            if( _bind instanceof HValue ){
+              _bind.bind( _instance );
+            }
+            else if( COMM.Values.values[_bind] !== undefined ){
+              COMM.Values.values[_bind].bind(_instance);
+            }
+            else {
+              console.log('renderNode warning; No such valueId:'+_bind);
+            }
           }
         }
       }

data/js/menus/minimenu/minimenu.js

@@ -38,7 +38,7 @@ HMiniMenu = HRadioButtonList.extend({
     }
     y -= (i-1)*this.subComponentHeight;
     if(y < 0){
-      y = y%this.subComponentHeight;
+      y = this.subComponentHeight%y;
     }
     if(this.options['menuItemGeom']){
       if(this.options.menuItemGeom.width){

data/lib/plugins/guiparser.rb

@@ -53,7 +53,7 @@ module RSence
         if gui_data.class == Array
           gui_data = {
             'type' => 'GUITree',
-            'version' => 0.7,
+            'version' => 0.9,
             'class' => 'RSence.GUIApp',
             'options' => {
               'priority' => 0,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rsence-pre
 version: !ruby/object:Gem::Version 
-  hash: 91
+  hash: 89
   prerelease: 
   segments: 
   - 2
   - 2
   - 0
-  - 18
-  version: 2.2.0.18
+  - 19
+  version: 2.2.0.19
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-02 00:00:00 Z
+date: 2011-08-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rsence-deps
@@ -163,6 +163,11 @@ files:
 - js/controls/radiobutton/themes/default/radiobutton.html
 - js/controls/radiobutton/themes/default/radiobutton_parts1-ie6.gif
 - js/controls/radiobutton/themes/default/radiobutton_parts1.png
+- js/controls/searchfield/searchfield.coffee
+- js/controls/searchfield/themes/default/searchfield.css
+- js/controls/searchfield/themes/default/searchfield.html
+- js/controls/searchfield/themes/default/searchfield_parts1-ie6.gif
+- js/controls/searchfield/themes/default/searchfield_parts1.png
 - js/controls/sliders/slider/slider.js
 - js/controls/sliders/slider/themes/default/hslider_tracks-ie6.gif
 - js/controls/sliders/slider/themes/default/hslider_tracks.png