rsence 2.1.11 → 2.2.0

data/js/comm/autosync/autosync.js

@@ -7,11 +7,11 @@
  */
 
 // Starts the synchronization upon page load.
-LOAD(
-  function(){
+COMM.AutoSyncStarter = {
+  start: function(){
     COMM.urlResponder=COMM.URLResponder.nu();
     COMM.Transporter.url=COMM.Transporter.HelloUrl;
     COMM.Transporter.stop=false;
     COMM.Transporter.sync();
   }
-);
+};

data/js/comm/jsloader/jsloader.js

@@ -35,6 +35,18 @@ COMM.JSLoader = HClass.extend({
     console.log("failed to load js: "+_resp.url);
   },
   
+  _formatUrl: function( _jsName ){
+    var
+    _this = this,
+    _isFullUrl = _jsName.slice(0,7) === 'http://' || _jsName.slice(0,8) === 'https://',
+    _url = _isFullUrl?_jsName:_this.uri+_jsName+'.js';
+    return _url;
+  },
+  loaded: function(_jsName){
+    var _url = this._formatUrl( _jsName );
+    this._loadedJS.push( _url );
+  },
+
 /** = Description
   * Loads a js package using the name.
   *
@@ -51,12 +63,13 @@ COMM.JSLoader = HClass.extend({
   *
   **/
   load: function(_jsName){
-    var _this = this,
-        _isFullUrl = _jsName.slice(0,7) === 'http://' || _jsName.slice(0,8) === 'https://',
-        _url = _isFullUrl?_jsName:_this.uri+_jsName+'.js';
+    var
+    _this = this,
+    _url = _this._formatUrl( _jsName );
     if((_this._loadedJS.indexOf(_url)!==-1)) {
       return;
     }
+    // console.log('jsLoader load:',_url);
     COMM.Queue.pause();
     _this._loadedJS.push(_url);
     if(BROWSER_TYPE.symbian && _isFullUrl){

data/js/comm/queue/queue.js

@@ -118,7 +118,7 @@ COMM.Queue = HApplication.extend({
           _strs.JS_EXEC_FAIL,
           _item,
           _strs.REASON,
-          e.description
+          e
         ].join(''));
       }
     }

data/js/comm/transporter/transporter.js

@@ -161,7 +161,7 @@ COMM.Transporter = HApplication.extend({
         _this._clientEvalError = e+" - "+e.description+' - '+_responseArray[i];
       }
     }
-    if(_this._serverInterruptView){
+    if(_this._serverInterruptView && _sesKey !== '' ){
       _this._serverInterruptView.die();
       _this._serverInterruptView = false;
     }
@@ -187,6 +187,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 +299,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
@@ -323,7 +323,13 @@ COMM.Values = HClass.extend({
   },
   
   _nativeEncode: function(_obj){
-    return JSON.stringify( _obj );
+    try{
+      return JSON.stringify( _obj );
+    }
+    catch(e){
+      console.log('invalid json:',_obj);
+      return "{}";
+    }
   },
   
   

data/js/controls/button/button.js

@@ -48,16 +48,21 @@ HClickButton = HButton.extend({
     click: true
   },
   
+  controlDefaults: HControlDefaults.extend({
+    clickOnValue: 1,
+    clickOffValue: 0
+  }),
+
 /** = Description
   * Sets the button enabled if this.value is 0.
   *
   **/
   refreshValue: function(){
     if( this.options.inverseValue ){
-      this.setEnabled( this.value === 1 );
+      this.setEnabled( this.value === this.options.clickOnValue );
     }
     else {
-      this.setEnabled( this.value === 0 );
+      this.setEnabled( this.value === this.options.clickOffValue );
     }
   },
 /** = Description
@@ -67,10 +72,10 @@ HClickButton = HButton.extend({
   click: function(){
     if(this.enabled){
       if( this.options.inverseValue ){
-        this.setValue(0);
+        this.setValue( this.options.clickOffValue );
       }
       else {
-        this.setValue(1);
+        this.setValue( this.options.clickOnValue );
       }
     }
   }

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

@@ -68,7 +68,7 @@
 
 .button_label {
   left: 6px; right: 6px; top: 2px;
-  height: 20px; line-height: 21px;
+  height: 20px; line-height: 20px;
   text-align: center; vertical-align: middle;
   font-family: Arial, sans-serif;
   font-size: 12px; font-weight: bold;

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

@@ -47,7 +47,7 @@
 
 .checkbox_label {
   left: 24px; right: 0px; top: 2px;
-  height: 20px; line-height: 21px;
+  height: 20px; line-height: 20px;
   text-align: left; vertical-align: middle;
   font-family: Arial, sans-serif;
   font-size: 12px;

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

@@ -53,35 +53,44 @@ HSheet = HControl.extend({
       var
       _this = this,
       _elemId = _this.elemId,
-      _styl = ELEM.setStyle,
       _rect = _this.rect,
       _width = _rect.width,
       _top = _rect.top,
       _left = 0-Math.floor(_rect.width/2)+_rect.left,
-      _height = _rect.height;
-      
-      _styl( _elemId, 'left', '0px');
-      _styl( _elemId, 'top', '0px');
-      _styl( _elemId, 'right', '0px');
-      _styl( _elemId, 'bottom', '0px');
-      _styl( _elemId, 'width', 'auto');
-      _styl( _elemId, 'height', 'auto');
-      _styl( _elemId, 'min-width', _width+'px');
-      _styl( _elemId, 'min-height', _height+'px');
-      
+      _height = _rect.height,
+      _styles = [
+        'left', '0px',
+        'top', '0px',
+        'right', '0px',
+        'bottom', '0px',
+        'width', 'auto',
+        'height', 'auto',
+        'min-width', _width+'px',
+        'min-height', _height+'px'
+      ],
+      i = 0, _len;
+      for( _len = _styles.length; i < _len; i+=2 ){
+        ELEM.setStyle( _elemId, _styles[i], _styles[i+1] );
+      }
       if(_this['markupElemIds']){
         var _stateId = _this.markupElemIds['state'];
-        _styl( _stateId, 'left', _left+'px' );
-        _styl( _stateId, 'top', _top+'px' );
-        _styl( _stateId, 'width', _width+'px' );
-        _styl( _stateId, 'height', _height+'px' );
+        _styles = [
+          'left', _left+'px',
+          'top', _top+'px',
+          'width', _width+'px',
+          'height', _height+'px'
+        ];
+        i = 0;
+        for( _len = _styles.length; i < _len; i+=2 ){
+          ELEM.setStyle( _stateId, _styles[i], _styles[i+1] );
+        }
       }
       //-- Show the rectangle once it gets created, unless visibility was set to++
       //-- hidden in the constructor.++
       if(undefined === _this.isHidden || _this.isHidden === false) {
-        _styl( _elemId, 'visibility', 'inherit');
+        ELEM.setStyle( _elemId, 'visibility', 'inherit');
       }
-      _styl( _elemId, 'display', 'block');
+      ELEM.setStyle( _elemId, 'display', 'block');
       _this._updateZIndex();
       _this.drawn = true;
     }

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

@@ -47,7 +47,7 @@
 
 .radiobutton_label {
   left: 24px; right: 0px; top: 0px;
-  height: 20px; line-height: 21px;
+  height: 20px; line-height: 24px;
   text-align: left; vertical-align: middle;
   font-family: Arial, sans-serif;
   font-size: 12px;

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: 0px;
+  line-height: 18px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  #{(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 {
+  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:24px;'}
+}
+
+.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;
+}
+