rsence-pre 2.2.2.1 → 2.3.0.0

data/VERSION

@@ -1 +1 @@
-2.2.2.1.pre
+2.3.0.0.pre

data/conf/default_conf.yaml

@@ -78,13 +78,18 @@
     :latency: 0
     #
     # HTTP Port number to listen to.
-    :port:  8001
+    :port:  '8001'
     #
     # Bind this ip address ('0.0.0.0' means all)
     :bind_address:  '127.0.0.1'
     #
     # Rack handler to use, defaults to puma
     :rack_require: puma
+    #
+    # These are default options. Ymmv, but these work fine for puma
+    :handler_options:
+      :Verbose: false
+      :Threads: '4:64' # puma default is '0:16'
   #
   # When enabled, sets http cache headers
   # to cache content as long as possible.

data/js/comm/queue/queue.js

@@ -85,7 +85,6 @@ COMM.Queue = HApplication.extend({
       _strs.REASON,
       _exception
     ].join('');
-    console.log( _errorText );
     return _errorText;
   },
   

data/js/comm/transporter/transporter.js

@@ -70,20 +70,18 @@ COMM.Transporter = HApplication.extend({
   * to report js errors to the server.
   * If no error, returns an empty string.
   **/
-  getClientEvalError: function(){
-    var _this = COMM.Transporter;
-    return _this._clientEvalError?'&err_msg=' +
-           COMM.Values._encodeString(_this._clientEvalError):'';
-  },
+  // getClientEvalError: function(){
+  //   var _this = COMM.Transporter;
+  //   return _this._clientEvalError?'&err_msg=' +
+  //          COMM.Values._encodeString(_this._clientEvalError):'';
+  // },
   
   parseResponseArray: function( _responseText ){
-    var _arr = eval( _responseText );
-    return _arr;
+    return HVM.decode( _responseText );
   },
   
   _nativeParseResponseArray: function( _responseText ){
-    var _arr = JSON.parse( _responseText );
-    return _arr;
+    return JSON.parse( _responseText );
   },
   
   setValues: function( _values ){
@@ -176,7 +174,9 @@ COMM.Transporter = HApplication.extend({
   flushBusy: function(){
     var _this = COMM.Transporter;
     _this.busy = false;
-    COMM.Values.tosync.length !== 0 && _this.sync();
+    if( COMM.Values.tosync.length !== 0 ){
+      _this.sync();
+    }
   },
   failMessage: function(_title,_message){
     var _this = COMM.Transporter,
@@ -320,18 +320,34 @@ COMM.Transporter = HApplication.extend({
     }
     // console.log('sync.');
     this.busy = true;
+    var _now = new Date().getTime();
     if(window['sesWatcher'] && window.sesWatcher['sesTimeoutValue']){
       // Sets the value of the session watcher to the current time. It could cause an unnecessary re-sync poll immediately after this sync otherwise.
-      sesWatcher.sesTimeoutValue.set( new Date().getTime() );
+      sesWatcher.sesTimeoutValue.set( _now );
     }
-    var _this = this,
-        _values = COMM.Values.sync(),
-        _sesKey = 'ses_key='+COMM.Session.ses_key,
-        _errorMessage = _this.getClientEvalError(),
-        _body = [_sesKey,_errorMessage,_values?'&values='+_values:''].join('');
+    var
+    _this = this,
+    // _values = HVM.sync(),
+    // _boundary = _now.toString(36)+(Math.random()*10000).toString(36)+(Math.random()*10000).toString(36),
+    // _separator = '--'+_boundary,
+    // _errorMessage = _this.getClientEvalError(),
+    _body = HVM.sync();
+    // _body = _separator+
+    //   '\r\nContent-Disposition: form-data; name="ses_key"\r\nContent-Type: text/plain\r\n'+
+    //   '\r\n'+COMM.Session.ses_key+'\r\n'+_separator;
+    // if( _values ){
+    //   _body += '\r\nContent-Disposition: form-data; name="values"\r\nContent-Type: application/json; charset=UTF-8\r\n'+
+    //   '\r\n'+_values+'\r\n'+_separator+'--\r\n';
+    // }
+    // else {
+    //   _body += '--\r\n';
+    // }
+    // _body = [_sesKey,_errorMessage,_values?'&values='+_values:''].join('');
     COMM.request(
       _this.url, {
         _this: _this,
+        // contentType: 'multipart/form-data; boundary='+_boundary,
+        contentType: 'application/json',
         onSuccess: COMM.Transporter.success,
         onFailure: COMM.Transporter.failure,
         method: 'POST',

data/js/comm/values/values.js

@@ -468,22 +468,54 @@ COMM.Values = HClass.extend({
   * An encoded string representation of values to synchronize.
   **/
   sync: function(){
-    if(this.tosync.length===0){
-      return false;
+    var
+    _this = this,
+    _response = [ COMM.Session.ses_key,{},[] ],
+    _error = COMM.Transporter._clientEvalError;
+
+    if( _error ){
+      _response[2].push({'err_msg':_error});
     }
-    var _syncValues = {},
-        _this = this,
-        _values = _this.values,
-        _tosync = _this.tosync,
-        _len = _tosync.length,
-        i = 0, _id, _value;
-    for(;i<_len;i++){
-      _id = _tosync.shift();
-      _value = _values[_id].value;
-      _syncValues[_id] = _value;
+
+    // new implementation, symmetric with the server response format
+    if( this.tosync.length > 0 ){
+      _response[1].set=[];
+      var
+      _syncValues = _response[1].set,
+      _values = _this.values,
+      _tosync = _this.tosync,
+      i = _tosync.length,
+      _id, _value;
+      while(i--){
+        _id = _tosync.shift();
+        _value = _values[_id].value;
+        _syncValues.push( [ _id, _value ] );
+      }
     }
-    return encodeURIComponent(_this.encode(_syncValues));
+    // console.log('response:',_response);
+    // console.log('encoded:',_this.encode(_response));
+    return _this.encode(_response);
   },
+
+  // Old sync implementation:
+  // sync: function(){
+  //   if(this.tosync.length===0){
+  //     return false;
+  //   }
+  //   var
+  //   _syncValues = {},
+  //   _this = this,
+  //   _values = _this.values,
+  //   _tosync = _this.tosync,
+  //   _len = _tosync.length,
+  //   i = 0, _id, _value;
+  //   for(;i<_len;i++){
+  //     _id = _tosync.shift();
+  //     _value = _values[_id].value;
+  //     _syncValues[_id] = _value;
+  //   }
+  //   return encodeURIComponent(_this.encode(_syncValues));
+  // },
   
   _detectNativeJSONSupport: function(){
     if(window['JSON']){

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

@@ -289,7 +289,7 @@ HSlider = HControl.extend({
   
   prevOrientation: 'c',
   
-  cssClassPrefix: 'h',
+  orientations: ['n','s','c'],
   
 /** = Description
   * Changes the thumb graphic. Possible orientations by default are
@@ -316,17 +316,16 @@ HSlider = HControl.extend({
     }
     var _toggleCSS = this.toggleCSSClass,
         _ctrlId    = this.markupElemIds.control,
-        _orientations = ['n','s','w','e','c'],
+        _orientations = this.orientations,
         _iOrientation = '',
         _cssClassName = '',
-        _cssClassPrefix = this.cssClassPrefix,
-        _cssClassVert = this._isVertical?'v':'',
+        _componentName = this.componentName,
         _activeOrientation = false,
         i = 0;
-    for(;i<5;i++){
+    for(;i<3;i++){
       _iOrientation = _orientations[i];
       _activeOrientation = (_orientation===_iOrientation);
-      _cssClassName = (_orientation==='c')?_cssClassPrefix+_cssClassVert+'slider_thumb':_cssClassPrefix+'slider_thumb_'+_iOrientation;
+      _cssClassName = (_orientation==='c')?_componentName+'_'+'thumb':_componentName+'_'+'thumb'+'_'+_iOrientation;
       _toggleCSS( _ctrlId, _cssClassName, _activeOrientation );
     }
     

data/js/controls/sliders/slider/themes/default/slider.css

@@ -1,108 +1,80 @@
-.hslider_track_left,
-.hslider_track_right,
-.hslider_track {
+.slider_track_left,
+.slider_track_right,
+.slider_track {
   position: absolute;
   height: 7px; top: 7px;
-  font-size: 0px;
+  font-size: 0;
   background-image: #{this.getCssFilePath('hslider_tracks.png')};
 }
 
-.hslider_track_left {
+.slider_track_left {
   left: 10px; width: 4px;
-  background-position: 0px 0px;
+  background-position: 0 0;
 }
 
-.hslider_track_right {
+.slider_track_right {
   right: 10px; width: 4px;
-  background-position: -4px 0px;
+  background-position: -4px 0;
 }
 
-.hslider_track {
+.slider_track {
   left: 14px; right: 14px;
-  background-position: 0px -14px;
+  background-position: 0 -14px;
 }
 
-.disabled .hslider_track_left {
-  background-position: 0px -7px;
+.disabled .slider_track_left {
+  background-position: 0 -7px;
 }
 
-.disabled .hslider_track_right {
+.disabled .slider_track_right {
   background-position: -4px -7px;
 }
 
-.disabled .hslider_track {
-  background-position: 0px -21px;
+.disabled .slider_track {
+  background-position: 0 -21px;
 }
 
-.hslider_thumb {
+.slider_thumb {
   position: absolute;
-  top: 0px; height: 21px; width: 21px;
-  font-size: 0px;
-  background-position: 0px 0px;
+  top: 0; height: 21px; width: 21px;
+  font-size: 0;
+  background-position: 0 0;
   background-image: #{this.getCssFilePath('slider_thumbs.png')};
 }
 
-.hslider_thumb:active {
-  background-position: 0px -22px;
+.slider_thumb:active {
+  background-position: 0 -22px;
 }
 
-.disabled .hslider_thumb {
-  background-position: 0px -44px;
+.disabled .slider_thumb {
+  background-position: 0 -44px;
 }
 
-.hslider_thumb_n,
-.hslider_thumb_s,
-.hslider_thumb_e,
-.hslider_thumb_w {
+.slider_thumb_n,
+.slider_thumb_s {
   position: absolute;
-  top: 0px; height: 21px; width: 21px;
+  top: 0; height: 21px; width: 21px;
   background-image: #{this.getCssFilePath('slider_thumbs.png')};
 }
 
-.hslider_thumb_e,
-.hslider_thumb_w {
-  left: 0px;
+.slider_thumb_n {
+ background-position: -22px 0;
 }
-
-.hslider_thumb_n {
- background-position: -22px 0px;
-}
-.hslider_thumb_n:active {
+.slider_thumb_n:active {
  background-position: -22px -22px;
 }
-.disabled .hslider_thumb_n {
+.disabled .slider_thumb_n {
  background-position: -22px -44px;
 }
 
-.hslider_thumb_s {
- background-position: -44px 0px;
+.slider_thumb_s {
+ background-position: -44px 0;
 }
-.hslider_thumb_s:active {
+.slider_thumb_s:active {
  background-position: -44px -22px;
 }
-.disabled .hslider_thumb_s {
+.disabled .slider_thumb_s {
  background-position: -44px -44px;
 }
 
-.hslider_thumb_w {
- background-position: -66px 0px;
-}
-.hslider_thumb_w:active {
- background-position: -66px -22px;
-}
-.disabled .hslider_thumb_w {
- background-position: -66px -44px;
-}
-
-.hslider_thumb_e {
- background-position: -88px 0px;
-}
-.hslider_thumb_e:active {
- background-position: -88px -22px;
-}
-.disabled .hslider_thumb_e {
- background-position: -88px -44px;
-}
-
-
 

data/js/controls/sliders/slider/themes/default/slider.html

@@ -1,5 +1,5 @@
-<div class="hslider_track_left"></div>
-<div class="hslider_track_right"></div>
-<div class="hslider_track"></div>
-<div class="hslider_thumb" id="control#{_ID}"></div>
+<div class="slider_track_left"></div>
+<div class="slider_track_right"></div>
+<div class="slider_track"></div>
+<div class="slider_thumb" id="control#{_ID}"></div>
 ${this.thumbSize=21;}

data/js/controls/sliders/vslider/themes/default/vslider.css

@@ -3,27 +3,27 @@
 .vslider_track {
   position: absolute;
   width: 7px; left: 7px;
-  font-size: 0px;
+  font-size: 0;
   background-image: #{this.getCssFilePath('vslider_tracks.png')};
 }
 
 .vslider_track_top {
   top: 10px; height: 4px;
-  background-position: 0px 0px;
+  background-position: 0 0;
 }
 
 .vslider_track_bottom {
   bottom: 10px; height: 4px;
-  background-position: 0px -4px;
+  background-position: 0 -4px;
 }
 
 .vslider_track {
   top: 14px; bottom: 14px;
-  background-position: -14px 0px;
+  background-position: -14px 0;
 }
 
 .disabled .vslider_track_top {
-  background-position: -7px 0px;
+  background-position: -7px 0;
 }
 
 .disabled .vslider_track_bottom {
@@ -31,22 +31,55 @@
 }
 
 .disabled .vslider_track {
-  background-position: -21px 0px;
+  background-position: -21px 0;
 }
 
 .vslider_thumb {
   position: absolute;
   font-size: 0px;
-  left: 0px; width: 21px; height: 21px;
-  background-position: 0px 0px;
+  left: 0; width: 21px; height: 21px;
+  background-position: 0 0;
   background-image: #{this.getCssFilePath('slider_thumbs.png')};
 }
 
 .vslider_thumb:active {
-  background-position: 0px -22px;
+  background-position: 0 -22px;
 }
 
 .disabled .vslider_thumb {
-  background-position: 0px -44px;
+  background-position: 0 -44px;
+}
+
+.vslider_thumb_e,
+.vslider_thumb_w {
+  position: absolute;
+  top: 0; height: 21px; width: 21px;
+  background-image: #{this.getCssFilePath('slider_thumbs.png')};
+}
+
+.vslider_thumb_e,
+.vslider_thumb_w {
+  left: 0;
+}
+
+.vslider_thumb_w {
+ background-position: -66px 0;
+}
+.vslider_thumb_w:active {
+ background-position: -66px -22px;
+}
+.disabled .vslider_thumb_w {
+ background-position: -66px -44px;
+}
+
+.vslider_thumb_e {
+ background-position: -88px 0;
+}
+.vslider_thumb_e:active {
+ background-position: -88px -22px;
 }
+.disabled .vslider_thumb_e {
+ background-position: -88px -44px;
+}
+
 

data/js/controls/sliders/vslider/vslider.js

@@ -35,7 +35,9 @@ HVSlider = HSlider.extend({
   componentName: "vslider",
     
   // This overrides the HSlider property.
-  _isVertical: true
+  _isVertical: true,
+
+  orientations: ['w','e','c']
   
 });
 

data/js/controls/stepper/stepper.js

@@ -140,7 +140,7 @@ HStepper = HControl.extend({
     **/
   mouseDown: function( x, y ){
     this.setMouseUp(true);
-    this._setRepeatInterval(  ( y - ELEM.getVisiblePosition( this.elemId )[1] ) <= 11  );
+    this._setRepeatInterval(  ( y - this.pageY() ) <= 11  );
     return true;
   },
   

data/js/controls/stringview/stringview.js

@@ -43,14 +43,12 @@ var HStringView, HLabel;
     *
     **/
     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 );
-          }
+      if(this.markupElemIds && this.markupElemIds.value) {
+        if( this.value !== undefined ){
+          this.setAttrOfPart( 'value', 'title', this.label );
+        }
+        else {
+          this.setMarkupOfPart( 'value', this.label );
         }
       }
     }

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

@@ -1 +1 @@
-<div class="stringview" id="value#{_ID}" title="#{this.label}"></div>
+<div class="stringview" id="value#{_ID}"></div>

data/js/controls/textcontrol/textcontrol.js

@@ -152,23 +152,16 @@ HTextControl = HControl.extend({
   textBlur: function(){
     this.hasTextFocus = false;
     this._clearChangeEventFn();
-    this._updateValueFromField();
     if(this.options.refreshOnBlur){
+      this._updateValueFromField();
       this.refreshValue();
     }
     return true;
   },
   
   idle: function(){
-    if( !this.options.refreshOnIdle ){ return; }
-    this.hasTextFocus && this._updateValueFromField();
-    try{
-      this.base();
-    }
-    catch(e){
-      console.error('HTextControl::onIdle error -> ',e);
-      debugger;
-      this.base();
+    if( this.hasTextFocus && this.options.refreshOnIdle && this.options.refreshOnInput ){
+      this._updateValueFromField();
     }
   },
   
@@ -354,12 +347,12 @@ HTextControl = HControl.extend({
   *
   **/
   textEnter: function(){
-    this.setValue(
-      this.validateText(
-        this.getTextFieldValue()
-      )
-    );
     if(this.options.refreshOnInput){
+      this.setValue(
+        this.validateText(
+          this.getTextFieldValue()
+        )
+      );
       this.refreshValue();
     }
     return false;
@@ -380,7 +373,8 @@ HNumericTextControl = HTextControl.extend({
   defaultEvents: {
     mouseWheel: true,
     textEnter: true,
-    contextMenu: true
+    contextMenu: true,
+    keyDown: true
   },
   
 /** Uses the mouseWheel event to step up/down the value.
@@ -391,6 +385,18 @@ HNumericTextControl = HTextControl.extend({
     this.setValue(Math.round(this.validateText(_value)));
   },
 
+  keyDown: function(_key){
+    if(_key===Event.KEY_UP){
+      this.mouseWheel(1);
+      return true;
+    }
+    else if(_key===Event.KEY_DOWN){
+      this.mouseWheel(-1);
+      return true;
+    }
+    return false;
+  },
+
 /** = Description
   * Extends the validateText method to ensure the
   * input is a number.

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

@@ -7,8 +7,8 @@
   color: #000;
   background-color: transparent;
   vertical-align: middle;
-  border: 0px;
-  left: 0px; top: 0px;
+  border: 0;
+  left: 0; top: 0;
   #{(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;'}
 }
 
@@ -23,7 +23,8 @@
 
 .default .textcontrol_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;bottom:1px;':'left:-2px;top:-2px;right:-2px;bottom:-2px;'}
+  #{(BROWSER_TYPE.chrome||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;bottom:1px;':'left:-2px;top:-2px;right:-2px;bottom:-2px;'}
+  #{(BROWSER_TYPE.chrome)?'top:1px;':''}
 }
 
 .default .textcontrol_bg {
@@ -34,10 +35,10 @@
 }
 
 .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;
+  left: 0; top: 0; right: 0; bottom: 0;
+  -moz-box-shadow: 0 0 3px #333;
+  -webkit-box-shadow: 0 0 3px #333;
+  box-shadow: 0 0 3px #333;
 }
 
 .default .disabled .textcontrol_bg {
@@ -57,22 +58,22 @@
 }
 
 .default .textcontrol_nw {
-  left: 0px; top: 0px;
-  background-position: 0px 0px;
+  left: 0; top: 0;
+  background-position: 0 0;
 }
 
 .default .textcontrol_ne {
-  right: 0px; top: 0px;
-  background-position: -7px 0px;
+  right: 0; top: 0;
+  background-position: -7px 0;
 }
 
 .default .textcontrol_sw {
-  left: 0px; bottom: 0px;
-  background-position: 0px -7px;
+  left: 0; bottom: 0;
+  background-position: 0 -7px;
 }
 
 .default .textcontrol_se {
-  right: 0px; bottom: 0px;
+  right: 0; bottom: 0;
   background-position: -7px -7px;
 }
 
@@ -88,13 +89,13 @@
 }
 
 .default .textcontrol_w {
-  left: 0px;
-  background-position: 0px 0px;
+  left: 0;
+  background-position: 0 0;
 }
 
 .default .textcontrol_e {
-  right: 0px;
-  background-position: -7px 0px;
+  right: 0;
+  background-position: -7px 0;
 }
 
 
@@ -109,13 +110,13 @@
 }
 
 .default .textcontrol_n {
-  top: 0px;
-  background-position: 0px 0px;
+  top: 0;
+  background-position: 0 0;
 }
 
 .default .textcontrol_s {
-  bottom: 0px;
-  background-position: 0px -7px;
+  bottom: 0;
+  background-position: 0 -7px;
 }