rsence-pre 2.2.0.34 → 2.2.0.35

data/VERSION

@@ -1 +1 @@
-2.2.0.34.pre
+2.2.0.35.pre

data/conf/default_conf.yaml

@@ -110,7 +110,7 @@
     :client_poll_priority: 60
     #
     # Reload the client after any plugins are reloaded:
-    :client_autoreload: false
+    :client_autoreload: true
   #
   #
   # Session-related settings

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;

data/js/controls/uploader/uploader.coffee

@@ -0,0 +1,111 @@
+##   RSence
+ #   Copyright 2008-2011 Riassence Inc.
+ #   http://riassence.com/
+ #
+ #   You should have received a copy of the GNU General Public License along
+ #   with this software package. If not, contact licensing@riassence.com
+ ##
+
+# The default locale settings, may be overridden on the server.
+HLocale.components.HUploader =
+  strings:
+    ok: 'OK'
+    stateLabels:
+       # Upload success states:
+       '0': "Select file...",
+       '1': "Uploading...",
+       '2': "Processing data...",
+       '3': "Upload Complete",
+       '4': "Preparing upload",
+       # Upload failure states:
+       '-1': "Error: Invalid request",
+       '-2': "Error: Invalid upload key",
+       '-3': "Error: Invalid data format",
+       '-4': "Error: File too big",
+       '-6': "Error: Post-processing failed"
+
+HUploader = HControl.extend
+  componentName: 'uploader'
+  uploadState: false
+  uploadKey: false
+  markupElemNames: [
+    'form',
+    'file',
+    'iframe',
+    'upload_progress',
+    'progress_label',
+    'progress_indicator',
+    'button',
+    'button_label',
+    'value',
+    'ack_button'
+  ]
+
+  defaultEvents:
+    click: true
+  
+  setUploadKey: (_uploadKey, _label)->
+    @setStyleOfPart( 'upload_progress', 'visibility', 'hidden' )
+    @setStyleOfPart( 'progress_indicator', 'visibility', 'hidden' )
+    @setStyleOfPart( 'ack_button', 'visibility', 'hidden' )
+    @setMarkupOfPart( 'button_label', _label )
+    @setStyleOfPart( 'button', 'visibility', 'inherit' )
+    @setStyleOfPart( 'form', 'visibility', 'inherit' )
+    @setAttrOfPart( 'form', 'action', '/U/'+_uploadKey, true )
+    @setAttrOfPart( 'file', 'value', '', true )
+    @uploadKey = _uploadKey
+  
+  setProgressState: (_state, _label)->
+    @setStyleOfPart( 'upload_progress', 'visibility', 'inherit' )
+    if _state == 3
+      @setStyleOfPart( 'progress_indicator', 'visibility', 'hidden' )
+      @setStyleOfPart( 'ack_button', 'visibility', 'inherit' )
+    else
+      @setStyleOfPart( 'progress_indicator', 'visibility', 'inherit' )
+      @setStyleOfPart( 'ack_button', 'visibility', 'hidden' )
+    @setMarkupOfPart( 'progress_label', _label )
+    @setStyleOfPart( 'button', 'visibility', 'hidden' )
+    @setStyleOfPart( 'form', 'visibility', 'hidden' )
+    if _state == 1
+      @elemOfPart( 'form' ).submit()
+  
+  setErrorState: (_label)->
+    @setStyleOfPart( 'progress_indicator', 'visibility', 'hidden' )
+    @setStyleOfPart( 'ack_button', 'visibility', 'inherit' )
+    @setMarkupOfPart( 'progress_label', '<span style="color:red;">'+_label+'</span>' )
+    @setStyleOfPart( 'button', 'visibility', 'hidden' )
+    @setStyleOfPart( 'form', 'visibility', 'hidden' )
+
+  setUploadState: (_state, _uploadKey)->
+    console.log('state:',_state,', uploadKey:',_uploadKey)
+    if _state != @uploadState
+      @uploadState = _state
+      _stateKey = _state.toString()
+      _stateLabels = HLocale.components.HUploader.strings.stateLabels
+      if _stateLabels[_stateKey]?
+        _label = _stateLabels[_stateKey]
+        ELEM.get(@markupElemIds.value).value = @valueObj.id
+        if _state == 0
+          @setUploadKey( _uploadKey, _label )
+        else if _state >= 1 and _state <= 4
+          @setProgressState( _state, _label )
+        else if _state < 0
+          @setErrorState( _label )
+  
+  refreshValue: ->
+    return unless typeof @value == 'string'
+    return if @value.indexOf(':::') == -1
+    _stateAndKey = @value.split(':::')
+    return unless _stateAndKey.length == 2
+    @setUploadState(
+      parseInt( _stateAndKey[0], 10),
+      _stateAndKey[1]
+    )
+  upload: ->
+    @setValue( '1:::'+@uploadKey )
+  
+  getNewUploadKey: ->
+    @setValue( '4:::'+@uploadKey )
+  
+  click: ->
+    @getNewUploadKey() if @uploadState == 3 or @uploadState < 0

data/js/foundation/view/view.js

@@ -1126,7 +1126,7 @@ HView = HClass.extend({
   * +self+
   *
   **/
-  setStyleOfPart: function(_partName, _name, _value, _cacheOverride) {
+  setStyleOfPart: function(_partName, _name, _value, _force) {
     if (!this['markupElemIds']){
       console.log('Warning, setStyleOfPart: no markupElemIds');
     }
@@ -1134,7 +1134,7 @@ HView = HClass.extend({
       console.log('Warning, setStyleOfPart: partName "'+_partName+'" does not exist for viewId '+this.viewId+'.');
     }
     else {
-      ELEM.setStyle(this.markupElemIds[_partName], _name, _value, _cacheOverride);
+      ELEM.setStyle(this.markupElemIds[_partName], _name, _value, _force);
     }
     return this;
   },
@@ -1151,12 +1151,12 @@ HView = HClass.extend({
   * The style of a specified markup element.
   *
   **/
-  styleOfPart: function(_partName, _name) {
+  styleOfPart: function(_partName, _name, _force) {
     if (this.markupElemIds[_partName]===undefined) {
       console.log('Warning, styleOfPart: partName "'+_partName+'" does not exist for viewId '+this.viewId+'.');
       return '';
     }
-    return ELEM.getStyle(this.markupElemIds[_partName], _name);
+    return ELEM.getStyle(this.markupElemIds[_partName], _name, _force);
   },
   
 /** = Description
@@ -1189,7 +1189,7 @@ HView = HClass.extend({
   * +_partName+::  The identifier of the markup element.
   *
   * = Returns
-  * The style of a specified markup element.
+  * The markup of a specified markup element.
   *
   **/
   markupOfPart: function(_partName) {
@@ -1199,6 +1199,66 @@ HView = HClass.extend({
     }
     return ELEM.getHTML(this.markupElemIds[_partName]);
   },
+  
+/** = Description
+  * Sets a element attribute of a specified markup element that has been bound to this
+  * view.
+  *
+  * = Parameters
+  * +_partName+::  The identifier of the markup element.
+  * +_value+::     Value for markup element.
+  *
+  * = Returns
+  * +self+
+  *
+  **/
+  setAttrOfPart: function( _partName, _value, _force ) {
+    if (this.markupElemIds[_partName]===undefined) {
+      console.log('Warning, setAttrOfPart: partName "'+_partName+'" does not exist for viewId '+this.viewId+'.');
+    }
+    else {
+      ELEM.setAttr( this.markupElemIds[_partName], _value, _force );
+    }
+    return this;
+  },
+  
+/** = Description
+  * Returns a element attribute of a specified markup element that has been bound to this
+  * view.
+  *
+  * = Parameters
+  * +_partName+::  The identifier of the markup element.
+  *
+  * = Returns
+  * The attribute of a specified markup element.
+  *
+  **/
+  attrOfPart: function(_partName, _force) {
+    if (this.markupElemIds[_partName]===undefined) {
+      console.log('Warning, attrOfPart: partName "'+_partName+'" does not exist for viewId '+this.viewId+'.');
+      return '';
+    }
+    return ELEM.getAttr(this.markupElemIds[_partName], _force);
+  },
+
+/** = Description
+  * Returns a element itself of a specified markup element that has been bound to this
+  * view.
+  *
+  * = Parameters
+  * +_partName+::  The identifier of the markup element.
+  *
+  * = Returns
+  * The element of a specified markup element.
+  *
+  **/
+  elemOfPart: function(_partName) {
+    if (this.markupElemIds[_partName]===undefined) {
+      console.log('Warning, elemOfPart: partName "'+_partName+'" does not exist for viewId '+this.viewId+'.');
+      return '';
+    }
+    return ELEM.get( this.markupElemIds[_partName] );
+  },
 
 /** = Description
   * Hides the component's main DOM element (and its children).
@@ -1889,6 +1949,7 @@ HView = HClass.extend({
     }
     var
     _searchTarget = HLocale.components[_componentClassName],
+    i = 0,
     _key;
     if( _searchTarget === undefined && (typeof _componentClassName === 'string') ){
       _searchTarget = HLocale.components;
@@ -1909,7 +1970,8 @@ HView = HClass.extend({
     if( _searchTarget[ _attrPath[0] ] === undefined ){
       return _default;
     }
-    for( _key in _attrPath ){
+    for( ; i < _attrPath.length; i++ ){
+      _key = _attrPath[i];
       if( typeof _searchTarget[_key] === 'object' ){
         _searchTarget = _searchTarget[_key];
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsence-pre
 version: !ruby/object:Gem::Version
-  version: 2.2.0.34
+  version: 2.2.0.35
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-30 00:00:00.000000000 Z
+date: 2012-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsence-deps
-  requirement: &70237315762560 !ruby/object:Gem::Requirement
+  requirement: &70211810491080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -22,7 +22,7 @@ dependencies:
         version: '966'
   type: :runtime
   prerelease: false
-  version_requirements: *70237315762560
+  version_requirements: *70211810491080
 description: ! 'RSence is a different and unique development model and software frameworks
   designed first-hand for real-time web applications. RSence consists of separate,
   but tigtly integrated data- and user interface frameworks.
@@ -243,7 +243,7 @@ files:
 - js/controls/uploader/themes/default/upload_progress.gif
 - js/controls/uploader/themes/default/uploader.css
 - js/controls/uploader/themes/default/uploader.html
-- js/controls/uploader/uploader.js
+- js/controls/uploader/uploader.coffee
 - js/controls/validatorview/themes/default/validator-ie6.gif
 - js/controls/validatorview/themes/default/validator.png
 - js/controls/validatorview/themes/default/validatorview.css

data/js/controls/uploader/uploader.js

@@ -1,162 +0,0 @@
-/*   RSence
- *   Copyright 2008 Riassence Inc.
- *   http://riassence.com/
- *
- *   You should have received a copy of the GNU General Public License along
- *   with this software package. If not, contact licensing@riassence.com
- */
-
-/** = Description
-  * HUploader class
-  *
-  *
-  *
-  **/
-
-HLocale.components.HUploader = {
-  strings: {
-    stateLabels: {
-    
-      // -- Upload success states: ++
-       '0': "Select file...",
-       '1': "Uploading...",
-       '2': "Processing data...",
-       '3': "Upload Complete",
-       '4': "Preparing upload",
-    
-      // -- Upload failure states: ++
-       '-1': "Error: Invalid request",
-       '-2': "Error: Invalid upload key",
-       '-3': "Error: Invalid data format",
-       '-4': "Error: File too big",
-       '-6': "Error: Post-processing failed"
-    }
-  }
-};
-
-var//RSence.Controls
-HUploader = HControl.extend({
-  componentName: 'uploader',
-  uploadState: false,
-  uploadKey: false,
-  markupElemNames: [
-    'form',
-    'file',
-    'iframe',
-    'upload_progress',
-    'progress_label',
-    'progress_indicator',
-    'button',
-    'button_label',
-    'value',
-    'ack_button'
-  ],
-
-/** = Description
-  * setUploadState function
-  *
-  * = Parameters
-  * +_state+::
-  * +_uploadKey+::
-  *
-  **/
-  setUploadState: function(_state,_uploadKey){
-    if(_state!==this.uploadState){
-      this.uploadState = _state;
-      var
-      _stateKey = _state.toString(),
-      _stateLabels = HLocale.components.HUploader.strings.stateLabels,
-      _label;
-      //console.log('stateKey:',_stateKey);
-      if(_stateLabels[_stateKey]!==undefined){
-        ELEM.get(this.markupElemIds.value).value=this.valueObj.id;
-        _label = _stateLabels[_stateKey];
-        //console.log('stateLabel:',_label);
-        if(_state===0){
-          ELEM.setStyle(this.markupElemIds.upload_progress,'visibility','hidden');
-          ELEM.setStyle(this.markupElemIds.progress_indicator,'visibility','hidden');
-          ELEM.setStyle(this.markupElemIds.ack_button,'visibility','hidden');
-          ELEM.setHTML(this.markupElemIds.button_label,_label);
-          ELEM.setStyle(this.markupElemIds.button,'visibility','inherit');
-          ELEM.setStyle(this.markupElemIds.form,'visibility','inherit');
-          ELEM.setAttr(this.markupElemIds.form,'action','/U/'+_uploadKey,true);
-          //console.log('uploadKey:',ELEM.getAttr(this.markupElemIds.form,'action',true));
-          ELEM.get(this.markupElemIds.file).value='';
-          this.uploadKey = _uploadKey;
-        }
-        else if(_state===1||_state===2||_state===3||_state===4){
-          ELEM.setStyle(this.markupElemIds.upload_progress,'visibility','inherit');
-          if(_state===1||_state===2||_state===4){
-            ELEM.setStyle(this.markupElemIds.progress_indicator,'visibility','inherit');
-            ELEM.setStyle(this.markupElemIds.ack_button,'visibility','hidden');
-          }
-          else {
-            ELEM.setStyle(this.markupElemIds.progress_indicator,'visibility','hidden');
-            ELEM.setStyle(this.markupElemIds.ack_button,'visibility','inherit');
-          }
-          ELEM.setHTML(this.markupElemIds.progress_label,_label);
-          ELEM.setStyle(this.markupElemIds.button,'visibility','hidden');
-          ELEM.setStyle(this.markupElemIds.form,'visibility','hidden');
-          if(_state===1){
-            ELEM.get(this.markupElemIds.form).submit();
-          }
-        }
-        else if(_state < 0){
-          ELEM.setStyle(this.markupElemIds.progress_indicator,'visibility','hidden');
-          ELEM.setStyle(this.markupElemIds.ack_button,'visibility','inherit');
-          ELEM.setHTML(this.markupElemIds.progress_label,'<span style="color:red;">'+_label+'</span>');
-          ELEM.setStyle(this.markupElemIds.button,'visibility','hidden');
-          ELEM.setStyle(this.markupElemIds.form,'visibility','hidden');
-        }
-      }
-    }
-  },
-  
-  /** = Description
-    * refreshValue function
-    *
-    *
-    **/
-  refreshValue: function(){
-    if(typeof this.value !== 'string'){return;}
-    if(this.value.indexOf(':::')<1){return;}
-    var _stateAndKey = this.value.split(':::');
-    if(_stateAndKey.length!==2){
-      return;
-    }
-    var _state = parseInt(_stateAndKey[0],10),
-        _uploadKey    = _stateAndKey[1];
-    this.setUploadState(_state,_uploadKey);
-  },
-  
-  /** = Description
-    * upload function
-    *
-    *
-    **/
-  upload: function(){
-    this.setValue('1:::'+this.uploadKey);
-  },
-  
-  /** = Description
-    *getNewUploadKey function
-    *
-    *
-    **/
-  getNewUploadKey: function(){
-    this.setValue('4:::'+this.uploadKey);
-  },
-  
-  /** = Description
-    * click function
-    *
-    *
-    **/
-  click: function(){
-    //console.log('click');
-    if((this.uploadState===3)||(this.uploadState<0)){
-      //console.log('clicked, state=',this.uploadState);
-      this.getNewUploadKey();
-    }
-  }
-});