rsence-pre 2.2.0.38 → 2.2.2.0

data/INSTALL.rdoc

@@ -132,7 +132,7 @@ This not only enables SessionStorage (persistent sessions between RSence restart
 * *json*[http://flori.github.com/json]:: Library for bi-directional JSON[http://json.org] conversion.
 * *yaml*[http://yaml4r.sourceforge.net/doc]:: Library for handling YAML[http://www.yaml.org] files
 * *randgen*:: C-optimized random string generator developed for RSence specifically
-* *jsmin_c*:: C-optimized Javascript whitespace removal library; Ruby wrapper developed for RSence specifically; based on the original JSMin[http://www.crockford.com/javascript/jsmin.html]
+* *jsminc*:: C-optimized Javascript whitespace removal library; Ryan Fitzgerald's Ruby wrapper for Douglas Crockford's jsmin.c
 * *jscompress*:: C-optimized Javascript compression and obfuscation library developed for RSence specifically
 * *html_min*:: C-optimized HTML whitespace removal library developed for RSence specifically
 * *cssmin*:: CSS whitespace removal library

data/VERSION

@@ -1 +1 @@
-2.2.0.38.pre
+2.2.2.0.pre

data/conf/default_conf.yaml

@@ -154,10 +154,6 @@
     # Defaults to false, will be the default in a future version.
     :clone_cookie_sessions: true
     #
-    # This limits the amount of cloned targets of a source session.
-    # NOTE: This has no effect yet, the code is not implemented.
-    :max_cloned_sessions: 10
-    #
     # This option overrides the default session timeout.
     # Don't set this to less than the expected poll interval,
     # otherwise the session might expire before the previous

data/conf/rsence_command_strings.yaml

@@ -39,7 +39,7 @@
   :plugin_directory_not_a_directory: |
     Plugin directory not a directory, expected:
       <%%= plugin_path.inspect %>
-  :warn_no_plugin_directory_in_project: |
+  :warn_no_directory_creating: |
     Warning! No <%%= dir_name %> directory in project, creating:
       <%%= dir_path.inspect %>
   :invalid_environment: |

data/js/comm/queue/queue.js

@@ -72,6 +72,22 @@ COMM.Queue = HApplication.extend({
     JS_EXEC_FAIL: 'Failed to execute the Javascript function: ',
     REASON: ' Reason:'
   },
+
+/** Basic queue item exception reporter. Override with your own, if needed.
+  **/
+  clientException: function( _exception, _item ){
+    var
+    _strs = this.STRINGS,
+    _errorText = [
+      _strs.ERR_PREFIX,
+      _strs.JS_EXEC_FAIL,
+      _exception.name+'->'+_exception.message,
+      _strs.REASON,
+      _exception
+    ].join('');
+    console.log( _errorText );
+    return _errorText;
+  },
   
 /** = Description
   * Flushes the queue until stopped.
@@ -112,14 +128,7 @@ COMM.Queue = HApplication.extend({
       
       // Displays an error message in the Javascript console, if failure.
       catch(e){
-        var _strs = this.STRINGS;
-        console.log([
-          _strs.ERR_PREFIX,
-          _strs.JS_EXEC_FAIL,
-          _item,
-          _strs.REASON,
-          e
-        ].join(''));
+        this.clientException( e, _item );
       }
     }
   },

data/js/comm/transporter/transporter.js

@@ -116,7 +116,7 @@ COMM.Transporter = HApplication.extend({
         _valueId = _values['del'][i];
         _valueManager.del( _valueId );
       }
-    }    
+    }
   },
   
 /** = Description
@@ -138,13 +138,15 @@ COMM.Transporter = HApplication.extend({
       _this.failure(resp);
       return;
     }
-    var _responseArray = _this.parseResponseArray(resp.X.responseText),
-        i = 2,
-        _responseArrayLen = _responseArray.length,
-        _sesKey = _responseArray[0],
-        _values = _responseArray[1],
-        _session = COMM.Session,
-        _queue = COMM.Queue;
+    var
+    _responseArray = _this.parseResponseArray(resp.X.responseText),
+    i = 2,
+    _responseArrayLen = _responseArray.length,
+    _sesKey = _responseArray[0],
+    _values = _responseArray[1],
+    _session = COMM.Session,
+    _queue = COMM.Queue,
+    _errorText;
     if(_sesKey === ''){
       console.log('Invalid session, error message should follow...');
     }
@@ -157,11 +159,10 @@ COMM.Transporter = HApplication.extend({
         _queue.pushEval( _responseArray[i] );
       }
       catch(e) {
-        console.log( 'clientError:'+e+" - "+e.description+' - '+_responseArray[i]);
-        _this._clientEvalError = e+" - "+e.description+' - '+_responseArray[i];
+        _this._clientEvalError = _queue.clientException( e, _responseArray[i] );
       }
     }
-    if(_this._serverInterruptView){
+    if(_this._serverInterruptView && _sesKey !== '' ){
       _this._serverInterruptView.die();
       _this._serverInterruptView = false;
     }
@@ -187,6 +188,110 @@ COMM.Transporter = HApplication.extend({
     _queue.push(function(){jsLoader.load('servermessage');});
     _queue.push(function(){ReloadApp.nu(_title,_message);});
   },
+
+  setInterruptAnim: function(_customMessage,_customColor){
+    var _this = COMM.Transporter;
+    if(!_this._serverInterruptView){
+      _this._serverInterruptView = HView.extend({
+        _setCustomMessage: function(_text){
+          ELEM.setHTML(this._messageDiv,_text);
+        },
+        _setCustomColor: function(_color){
+          this.setStyle('background-color',_color);
+        },
+        _setFailedResp: function(_resp){
+          if( _resp !== undefined && typeof _resp !== 'string' ){
+            this._failedResp = _resp;
+          }
+          this._errorIndex++;
+          return this;
+        },
+        _retry: function(){
+          this._retryIndex++;
+          var _resp = this._failedResp;
+          COMM.request(
+            _resp.url,
+            _resp.options
+          );
+        },
+        onIdle: function(){
+          var _currentDate = new Date().getTime();
+          this.bringToFront();
+          if( this._errorIndex > 0 &&
+              (this._retryIndex !== this._errorIndex) &&
+              (this._lastError + 2000 < _currentDate) &&
+              this._failedResp ){
+            this._lastError = _currentDate;
+            this._retry();
+          }
+          this.base();
+        },
+        _errorIndex: 0,
+        _retryIndex: 0,
+        _lastError: new Date().getTime(),
+        die: function(){
+          var _app = this.app;
+          HSystem.reniceApp(_app.appId,this._origPriority);
+          this.base();
+          _app.sync();
+        },
+        drawSubviews: function(){
+          var _style = [
+            ['padding-left', '8px'],
+            ['background-color', '#600'],
+            ['text-align','center'],
+            ['color', '#fff'],
+            ['font-size', '16px'],
+            ['opacity', 0.85]
+          ], i = 0;
+          for( ; i<_style.length; i++ ){
+            this.setStyle( _style[i][0], _style[i][1] );
+          }
+          this._messageDiv = ELEM.make(this.elemId);
+          ELEM.setHTML(this._messageDiv,this.app.serverLostMessage);
+          this._origPriority = HSystem.appPriorities[this.appId];
+          if(HSystem.appPriorities[this.appId]<10){
+            HSystem.reniceApp(this.appId,10);
+          }
+          this._anim = HView.extend({
+            _animIndex: 0,
+            _anim: function(){
+              var _targetRect,
+                  _width = ELEM.getSize(this.parent.elemId)[0];
+              this._animIndex++;
+              if(this._animIndex%2===0){
+                _targetRect = HRect.nu(0,0,80,20);
+              }
+              else {
+                _targetRect = HRect.nu(_width-80,0,_width,20);
+              }
+              this.animateTo(_targetRect,2000);
+            },
+            onAnimationEnd: function(){
+              if(this.drawn){
+                this._anim();
+              }
+            }
+          }
+        ).nu( [0,0,80,20], this ).setStyle('background-color','#fff').setStyle('opacity',0.8)._anim();
+        }
+      }).nu([0,0,200,20,0,null],_this);
+      if( typeof _customMessage !== 'string' ){
+        _this._serverInterruptView._setFailedResp(_customMessage);
+      }
+    }
+    if( _customMessage !== undefined ) {
+      if( typeof _customMessage === 'string' ){
+        _this._serverInterruptView._setCustomMessage(_customMessage);
+      }
+    }
+    if( !_this.stop ){
+      _this._serverInterruptView._setFailedResp();
+    }
+    if( _customColor !== undefined ){
+      _this._serverInterruptView._setCustomColor(_customColor);
+    }
+  },
   
 /** Called by the XMLHttpRequest, when there was a failure in communication.
   **/
@@ -195,88 +300,7 @@ COMM.Transporter = HApplication.extend({
     // server didn't respond, likely network issue.. retry.
     if(_resp.X.status===0){
       console.log(_this.serverLostMessage);
-      if(!_this._serverInterruptView){
-        _this._serverInterruptView = HView.extend({
-          _setFailedResp: function(_resp){
-            if(_resp!==undefined){
-              this._failedResp = _resp;
-            }
-            this._errorIndex++;
-            return this;
-          },
-          _retry: function(){
-            this._retryIndex++;
-            var _resp = this._failedResp;
-            COMM.request(
-              _resp.url,
-              _resp.options
-            );
-          },
-          onIdle: function(){
-            var _currentDate = new Date().getTime();
-            this.bringToFront();
-            if( this._errorIndex > 0 &&
-                (this._retryIndex !== this._errorIndex) &&
-                (this._lastError + 2000 < _currentDate) &&
-                this._failedResp ){
-              this._lastError = _currentDate;
-              this._retry();
-            }
-            this.base();
-          },
-          _errorIndex: 0,
-          _retryIndex: 0,
-          _lastError: new Date().getTime(),
-          die: function(){
-            var _app = this.app;
-            HSystem.reniceApp(_app.appId,this._origPriority);
-            this.base();
-            _app.sync();
-          },
-          drawSubviews: function(){
-            var _style = [
-              ['padding-left', '8px'],
-              ['background-color', '#600'],
-              ['text-align','center'],
-              ['color', '#fff'],
-              ['font-size', '16px'],
-              ['opacity', 0.85]
-            ], i = 0;
-            for( ; i<_style.length; i++ ){
-              this.setStyle( _style[i][0], _style[i][1] );
-            }
-            this.setHTML(this.app.serverLostMessage);
-            this._origPriority = HSystem.appPriorities[this.appId];
-            if(HSystem.appPriorities[this.appId]<10){
-              HSystem.reniceApp(this.appId,10);
-            }
-            this._anim = HView.extend({
-              _animIndex: 0,
-              _anim: function(){
-                var _targetRect,
-                    _width = ELEM.getSize(this.parent.elemId)[0];
-                this._animIndex++;
-                if(this._animIndex%2===0){
-                  _targetRect = HRect.nu(0,0,80,20);
-                }
-                else {
-                  _targetRect = HRect.nu(_width-80,0,_width,20);
-                }
-                this.animateTo(_targetRect,2000);
-              },
-              onAnimationEnd: function(){
-                if(this.drawn){
-                  this._anim();
-                }
-              }
-            }
-          ).nu( [0,0,80,20], this ).setStyle('background-color','#fff').setStyle('opacity',0.8)._anim();
-          }
-        }).nu([0,0,200,20,0,null],_this)._setFailedResp(_resp);
-      }
-      else {
-        _this._serverInterruptView._setFailedResp();
-      }
+      _this.setInterruptAnim(_resp);
     }
     else {
       _this.failMessage('Transporter Error','Transporter was unable to complete the synchronization request.');

data/js/comm/values/values.js

@@ -66,7 +66,7 @@ COMM.Values = HClass.extend({
   },
   
 /** = Description
-  * Sets and decodes the +_data+. Main value setter interface 
+  * Sets and decodes the +_data+. Main value setter interface
   * for the server representation of +HValue+.
   *
   * = Parameters
@@ -328,7 +328,7 @@ COMM.Values = HClass.extend({
     }
     catch(e){
       console.log('invalid json:',_obj);
-      return "{}"
+      return "{}";
     }
   },
   

data/js/controls/dialogs/sheet/sheet.js

@@ -68,7 +68,7 @@ HSheet = HControl.extend({
         'min-width', _width+'px',
         'min-height', _height+'px'
       ],
-      i = 0, _len;;
+      i = 0, _len;
       for( _len = _styles.length; i < _len; i+=2 ){
         ELEM.setStyle( _elemId, _styles[i], _styles[i+1] );
       }

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

@@ -8,12 +8,12 @@
   background-color: transparent;
   vertical-align: middle;
   border: 0px;
-  left: 18px; top: 4px;
+  left: 18px; top: 0px;
   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;'}
+  #{(BROWSER_TYPE.firefox||BROWSER_TYPE.ie7||BROWSER_TYPE.ie8||BROWSER_TYPE.ie9||BROWSER_TYPE.opera)?'padding-left:2px;width:85% !important;height:90% !important;':BROWSER_TYPE.ie6?'right:3px;height:16px;':'padding:2px;padding-top:4px;right:3px;height:22px;width:auto;'}
 }
 
 .default .searchfield_input:focus {
@@ -27,7 +27,7 @@
 
 .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;'}
+  #{(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:24px;'}
 }
 
 .default .searchfield_fade,

data/js/controls/tab/tab.js

@@ -120,14 +120,14 @@ HTab = HControl.extend({
     if(this.selectIdx!==-1){
       var _tabSelectElemId = this.tabLabels[this.selectIdx],
           _tabSelectViewId = this.tabs[this.selectIdx];
-      ELEM.removeClassName(_tabSelectElemId,'item-fg');
+      ELEM.delClassName(_tabSelectElemId,'item-fg');
       ELEM.addClassName(_tabSelectElemId,'item-bg');
       HSystem.views[_tabSelectViewId].hide();
     }
     if(_tabIdx!==-1){
       var _tabLabelElemId = this.tabLabels[_tabIdx],
           _tabViewId = this.tabs[_tabIdx];
-      ELEM.removeClassName(_tabLabelElemId,'item-bg');
+      ELEM.delClassName(_tabLabelElemId,'item-bg');
       ELEM.addClassName(_tabLabelElemId,'item-fg');
       HSystem.views[_tabViewId].show();
     }
@@ -174,7 +174,8 @@ HTab = HControl.extend({
       ELEM.setAttr(_tabLabelElemId,'href','javascript:HSystem.views['+this.viewId+'].selectTab('+_tabIdx+');');
     }
     else if (this.tabTriggerLink && !(BROWSER_TYPE.ie7 || BROWSER_TYPE.ie6)){
-      ELEM.setAttr(_tabLabelElemId,'onclick','HSystem.views['+this.viewId+'].selectTab('+_tabIdx+');');
+      var _this = this;
+      Event.observe( ELEM.get(_tabLabelElemId), 'click', function(){ _this.selectTab(_tabIdx); } );
     }
     else {
       this.tabTriggerLink = false;

data/js/controls/textcontrol/textcontrol.js

@@ -29,6 +29,7 @@ HTextControl = HControl.extend({
   controlDefaults: (HControlDefaults.extend({
     refreshOnBlur: true,
     refreshOnInput: true,
+    refreshOnIdle: true,
     focusOnCreate: false
   })),
   
@@ -158,7 +159,8 @@ HTextControl = HControl.extend({
     return true;
   },
   
-  onIdle: function(){
+  idle: function(){
+    if( !this.options.refreshOnIdle ){ return; }
     this.hasTextFocus && this._updateValueFromField();
     try{
       this.base();

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

@@ -9,7 +9,7 @@
   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 {