rsence-pre 2.1.0.4.pre → 2.1.0.6.pre

data/VERSION

@@ -1 +1 @@
-2.1.0.4.pre
+2.1.0.6.pre

data/conf/default_conf.yaml

@@ -288,6 +288,9 @@
         - checkboxlist        # HCheckboxList
         - radiobuttonlist     # HRadiobuttonList
         - propertylist        # HPropertyList
+        - propertylisteditor  # HPropertyEditor
+        - minimenu            # HMiniMenu
+        - minimenuitem        # HMiniMenuItem
 
     # Special packages that include other packages (not used currently)
     :compound_packages:

data/js/foundation/eventmanager/eventmanager.js

@@ -841,22 +841,28 @@ EVENT = {
   **/
   keyDown: function(e) {
     var _this = EVENT,
-        _theKeyCode = e.keyCode;
+        _theKeyCode = e.keyCode,
+        _keyDownStateForActiveControl = _this.activeControl?_this.focusOptions[_this.activeControl.elemId].keyDown:false,
+        _repeat = (_keyDownStateForActiveControl === 'repeat'),
+        _stopEvent = false;
     _this._modifiers(e);
     if(!_this.status[_this.cmdKeyDown] && _this._detectCmdKey(e.keyCode)){
       _this.status[_this.cmdKeyDown] = true;
     }
-    if (_this.activeControl && _this.focusOptions[_this.activeControl.elemId].keyDown === true) {
-      Event.stop(e);
-      // Workaround for msie rapid fire keydown
-      if (_this._lastKeyDown !== _theKeyCode) {
-        _this.activeControl.keyDown(_theKeyCode);
+    if (_this.activeControl && _keyDownStateForActiveControl) {
+      if ((_this._lastKeyDown !== _theKeyCode) || _repeat) {
+        if(_this.activeControl.keyDown(_theKeyCode)){
+          _stopEvent = true;
+        }
       }
     }
     // Insert key to the realtime array, remove in keyUp
     if (_this.status[_this.keysDown].indexOf(_theKeyCode) === -1) {
       _this.status[_this.keysDown].push(_theKeyCode);
     }
+    if (!_this.status[_this.cmdKeyDown] && _stopEvent){
+      Event.stop(e);
+    }
     _this._lastKeyDown = _theKeyCode;
   },
 
@@ -873,20 +879,28 @@ EVENT = {
         _theKeyCode = e.keyCode,
         _keyCodeIndex,
         i = 0,
+        _stopEvent = false,
         _ctrlId,
         _ctrl;
     _this._modifiers(e);
     _this._lastKeyDown = null;
     if (_this.activeControl && _this.focusOptions[_this.activeControl.elemId].keyUp === true) {
-      _this.activeControl.keyUp(_theKeyCode);
+      if(_this.activeControl.keyUp(_theKeyCode)){
+        _stopEvent = true;
+      }
     }
     for (; i < _this.textEnterCtrls.length; i++) {
       _ctrlId = _this.textEnterCtrls[i];
       _ctrl = HSystem.views[_ctrlId];
       if (_ctrl.textEnter) {
-        _ctrl.textEnter();
+        if(_ctrl.textEnter()){
+          _stopEvent = true;
+        }
       }
     }
+    if (!_this.status[_this.cmdKeyDown] && _stopEvent){
+      Event.stop(e);
+    }
     if(_this.status[_this.cmdKeyDown] && _this._detectCmdKey(e.keyCode)){
       _this.status[_this.cmdKeyDown] = false;
     }
@@ -897,12 +911,10 @@ EVENT = {
     }
   },
 
-  /* Prevents the onKeyPress event (key being hold down; we don't need that event) */
+  /* Using keyPress as an alias for the keyDown event */
   keyPress: function(e) {
     var _this = EVENT;
-    if (_this.activeControl && _this.focusOptions[_this.activeControl.elemId].keyDown === true) {
-      Event.stop(e);
-    }
+    _this.keyDown(e);
   },
 
 

data/js/foundation/view/view.js

@@ -756,7 +756,7 @@ HView = HClass.extend({
   **/
   markupElemNames: ['bg', 'label', 'state', 'control', 'value', 'subview'],
   drawMarkup: function() {
-    ELEM.setStyle(this.elemId, 'display', 'none', true);
+    // ELEM.setStyle(this.elemId, 'display', 'none', true);
     
     // continue processing from here on:
     var _markupStatus = this._loadMarkup();
@@ -774,7 +774,7 @@ HView = HClass.extend({
       }
     }
     
-    ELEM.setStyle(this.elemId, 'display', this.displayMode );
+    // ELEM.setStyle(this.elemId, 'display', this.displayMode );
     return this;
   },
   

data/js/lists/listitems/listitems.js

@@ -20,7 +20,7 @@
   ## be unique.
   ##
   ## == Important
-  ** The parent object of a HListItem needs to be a compatible hash, like HRadiobuttonList.
+  ** The parent object of a HListItem needs to be a compatible component, like HRadioButtonList.
   ##
   ***/
 var//RSence.Lists

data/js/lists/propertylist/propertylist.js

@@ -16,67 +16,172 @@
   ***/
 var//RSence.Lists
 HPropertyList = HControl.extend({
-  keyColumnWidth: 100,
-  rowHeight: 15,
-  keyIndent: 8,
+  
+  defaultEvents: {
+    click: true
+  },
+  
+  controlDefaults: (HControlDefaults.extend({
+    keyColumnWidth: 100,
+    hideTypeColumn: false,
+    useEditor: false,
+    rowHeight: 15,
+    keyIndent: 8
+  })),
+  
+  click: function(x,y){
+    if(this.options.useEditor){
+      var
+      clickY = y-this.contentView.pageY(),
+      itemNum = Math.floor(clickY/this.options.rowHeight);
+      if((clickY < 0) || (itemNum > this.valueTokens.length-1)){
+        this.editor.hide();
+        return;
+      }
+      this.editItem( itemNum );
+    }
+  },
+  
+  keyColumnRight: function(){
+    return this.options.keyColumnWidth;
+  },
+  typeColumnLeft: function(){
+    return this.keyColumnRight();
+  },
+  typeColumnRight: function(){
+    return this.options.keyColumnWidth + 60;
+  },
+  
+  valueColumnLeft: function(){
+    if(this.options.hideTypeColumn){
+      return this.keyColumnRight();
+    }
+    else {
+      return this.typeColumnRight();
+    }
+  },
+  
   drawSubviews: function(){
-    this.propertyItems = [];
-    this.keyRowStyle += 'height:'+this.rowHeight+'px;';
-    this.typeRowStyle += 'height:'+this.rowHeight+'px;';
-    this.valueRowStyle += 'height:'+this.rowHeight+'px;';
-    this.rowSeparatorStyle += 'height:'+this.rowHeight+'px;';
-    this.setStyle('font-size','11px');
-    this.setStyle('overflow-y','auto');
-    this.keyColumn = HView.nu(
-      [ 0, 0, this.keyColumnWidth, 24 ],
+    
+    var borderAndBg = ELEM.make(this.elemId);
+    ELEM.setCSS(borderAndBg,'position:absolute;left:0;top:0;right:0;bottom:0;background-color:#e6e6e6;border:1px solid #999;');
+    
+    this.markupElemIds = {
+      bg: borderAndBg
+    };
+    
+    this.contentView = HScrollView.extend({
+      click: function(x,y){
+        this.parent.click(x,y);
+        return true;
+      }
+    }).nu(
+      [ 1, 25, null, null, 1, 1 ],
       this, {
-        style: [ [ 'border-right', '1px solid #999' ] ]
+        scrollY: 'auto',
+        scrollX: false,
+        events: {
+          click: true
+        }
       }
     );
-    this.typeColumn = HView.nu(
-      [ this.keyColumnWidth, 0, 80, 24 ],
-      this, {
+    
+    var separatorParentElemId = ELEM.make(this.contentView.elemId);
+    ELEM.setCSS( separatorParentElemId, 'position:absolute;left:0;top:0;right:0;' );
+    this.separatortParentElemId = separatorParentElemId;
+
+    this.propertyItems = [];
+    
+    // Editor initialization
+    if(this.options.useEditor){
+      this.editorValue = HValue.nu( false, [ 'test', 's', 'Test String' ] );
+      this.editor = HPropertyListEditor.nu(
+        [0,0,null,this.options.rowHeight+2,0,null],
+        this.contentView, {
+          propertyItems: this.propertyItems,
+          visible: false,
+          valueObj: this.editorValue
+        }
+      );
+    }
+    
+    // Set row style heights from options
+    var rowHeightStyle = 'height:'+this.options.rowHeight+'px;';
+    this.keyRowStyle += rowHeightStyle;
+    this.typeRowStyle += rowHeightStyle;
+    this.valueRowStyle += rowHeightStyle;
+    this.rowSeparatorStyle += rowHeightStyle;
+    
+    // Style common font style
+    this.contentView.setStyle('font-size','11px');
+    
+    // Create the key column
+    this.keyColumn = HView.nu(
+      [ 0, 0, this.keyColumnRight(), 24 ],
+      this.contentView, {
         style: [ [ 'border-right', '1px solid #999' ] ]
       }
     );
+    
+    // Create the type column
+    if(!this.options.hideTypeColumn){
+      this.typeColumn = HView.nu(
+        [ this.typeColumnLeft(), 0, 60, 24 ],
+        this.contentView, {
+          style: [ [ 'border-right', '1px solid #999' ] ]
+        }
+      );
+    }
+    
+    // Create the value column
     this.valueColumn = HView.nu(
-      [ this.keyColumnWidth + 80, 0, 0, 24, 0, null ],
-      this
+      [ this.valueColumnLeft(), 0, 0, 24, 0, null ],
+      this.contentView
     );
+    
+    // Create the column headers
     this.header = HView.extend({
       drawSubviews: function(){
         var
-        keyColumnWidth = this.parent.keyColumnWidth;
-        this.keyLabel = HStringView.nu(
-          [ 0, 0, keyColumnWidth, 24 ],
+        keyColumnWidth = this.parent.options.keyColumnWidth;
+        this.keyLabel = HView.nu(
+          [ 0, 0, this.parent.keyColumnRight(), 24 ],
           this, {
-            value: '<b>Key</b>',
+            html: '<b>Key</b>',
             style: [
               [ 'text-align', 'middle' ],
               [ 'text-indent', '16px' ],
-              [ 'line-height', '24px' ]
-            ]
-          }
-        );
-        this.typeLabel = HStringView.nu(
-          [ keyColumnWidth, 0, 80, 24 ],
-          this, {
-            value: '<b>Type</b>',
-            style: [
-              [ 'text-align', 'middle' ],
-              [ 'text-indent', '8px' ],
-              [ 'line-height', '24px' ]
+              [ 'line-height', '24px' ],
+              [ 'font-size', '13px' ],
+              [ 'border-right', '3px double #999' ]
             ]
           }
         );
-        this.valueLabel = HStringView.nu(
-          [ keyColumnWidth + 80, 0, 80, 24, 0, null ],
+        if(!this.parent.options.hideTypeColumn){
+          this.typeLabel = HView.nu(
+            [ this.parent.typeColumnLeft(), 0, 60, 24 ],
+            this, {
+              html: '<b>Type</b>',
+              style: [
+                [ 'text-align', 'middle' ],
+                [ 'text-indent', '8px' ],
+                [ 'line-height', '24px' ],
+                [ 'font-size', '13px' ],
+                [ 'padding-right', '1px' ],
+                [ 'border-right', '1px solid #999' ]
+              ]
+            }
+          );
+        }
+        this.valueLabel = HView.nu(
+          [ this.parent.valueColumnLeft(), 0, 80, 24, 0, null ],
           this, {
-            value: '<b>Value</b>',
+            html: '<b>Value</b>',
             style: [
               [ 'text-align', 'middle' ],
               [ 'text-indent', '8px' ],
-              [ 'line-height', '24px' ]
+              [ 'line-height', '24px' ],
+              [ 'font-size', '13px' ]
             ]
           }
         );
@@ -87,30 +192,75 @@ HPropertyList = HControl.extend({
         style: [ [ 'border-bottom', '1px solid #999' ] ]
       }
     );
+    
+    // Create the resize control (invisible, just above the first column separator)
     this.resizeColumns = HControl.extend({
       drag: function(x,y){
         var
-        parentX = x - this.parent.pageX(),
-        keyColumnWidth = parentX-1,
-        parentWidth = ELEM.getVisibleSize( this.parent.elemId )[0];
+        parent = this.parent,
+        options = parent.options,
+        keyColumnWidth = x - parent.pageX(),
+        parentWidth = parent.rect.width;
+        
         if(keyColumnWidth < 80){
           keyColumnWidth = 80;
         }
-        else if ( keyColumnWidth > parentWidth-160 ){
-          keyColumnWidth = parentWidth - 160;
+        else if ( keyColumnWidth > parentWidth-140 ){
+          keyColumnWidth = parentWidth - 140;
+        }
+        
+        // Set the dragger itself
+        this.rect.offsetTo( keyColumnWidth-1, 0 ); this.drawRect();
+        
+        // Resize the key column
+        options.keyColumnWidth = keyColumnWidth;
+        
+        var
+        keyColumn = parent.keyColumn,
+        keyLabel  = parent.header.keyLabel,
+        keyRight  = parent.keyColumnRight();
+        keyColumn.rect.setRight( keyRight ); 
+        keyLabel.rect.setRight(  keyRight ); 
+        
+        var
+        valueColumn = parent.valueColumn,
+        valueLabel  = parent.header.valueLabel,
+        valueLeft   = parent.valueColumnLeft();
+        
+        valueColumn.rect.setLeft( valueLeft );
+        valueLabel.rect.setLeft( valueLeft );
+        
+        // Redraw the rects
+        keyColumn.drawRect();
+        keyLabel.drawRect();
+        valueColumn.drawRect();
+        valueLabel.drawRect();
+        
+        // Resize the type column
+        if(!options.hideTypeColumn){
+          var
+          typeColumn = parent.typeColumn,
+          typeLabel  = parent.header.typeLabel,
+          typeLeft   = parent.typeColumnLeft(),
+          typeRight  = parent.typeColumnRight();
+          
+          typeColumn.rect.setLeft( typeLeft );
+          typeColumn.rect.setRight( typeRight );
+          
+          typeLabel.rect.setLeft( typeLeft, 0 );
+          typeLabel.rect.setRight( typeRight, 0 );
+          
+          typeColumn.drawRect();
+          typeLabel.drawRect();
+        }
+        
+        if(options.useEditor){
+          parent.editor.resizeKeyColumn();
         }
-        selfX = keyColumnWidth - 2;
-        this.rect.offsetTo( selfX, 0 ); this.drawRect();
-        this.parent.keyColumn.rect.setRight( keyColumnWidth ); this.parent.keyColumn.drawRect();
-        this.parent.header.keyLabel.rect.setWidth( keyColumnWidth ); this.parent.header.keyLabel.drawRect();
-        this.parent.typeColumn.rect.offsetTo( keyColumnWidth, 0 ); this.parent.typeColumn.drawRect();
-        this.parent.header.typeLabel.rect.offsetTo( keyColumnWidth, 0 ); this.parent.header.typeLabel.drawRect();
-        this.parent.valueColumn.rect.setLeft( keyColumnWidth+80 ); this.parent.valueColumn.drawRect();
-        this.parent.header.valueLabel.rect.setLeft( keyColumnWidth+80 ); this.parent.header.valueLabel.drawRect();
-        this.parent.keyColumnWidth = keyColumnWidth;
+        
       }
     }).nu(
-      [ this.keyColumnWidth - 2, 0, 5, 25 ],
+      [ this.keyColumnRight(), 0, 5, 25 ],
       this, {
         events: { draggable: true },
         style: [
@@ -118,10 +268,13 @@ HPropertyList = HControl.extend({
         ]
       }
     );
+    
   },
+  
+  // Tokenize arrays
   arrayTokens: function( arr, name ){
     this.addToken( 'a', name, '('+arr.length+' items)' );
-    this.nodeProperties.left += this.keyIndent;
+    this.nodeProperties.left += this.options.keyIndent;
     var i = 0, val, type;
     for( ; i < arr.length; i++ ){
       val = arr[i];
@@ -136,8 +289,10 @@ HPropertyList = HControl.extend({
         this.addToken( type, i, val );
       }
     }
-    this.nodeProperties.left -= this.keyIndent;
+    this.nodeProperties.left -= this.options.keyIndent;
   },
+  
+  // Get length of hash
   hashLen: function( hash ){
     var count = 0;
     for( var item in hash ){
@@ -145,6 +300,8 @@ HPropertyList = HControl.extend({
     }
     return count;
   },
+  
+  // Sort hash keys
   hashSortedKeys: function( hash ){
     var
     keys = [],
@@ -154,9 +311,11 @@ HPropertyList = HControl.extend({
     }
     return keys.sort();
   },
+  
+  // Tokenize hashes
   hashTokens: function( hash, name ){
     this.addToken( 'h', name, '('+this.hashLen( hash )+' items)' );
-    this.nodeProperties.left += this.keyIndent;
+    this.nodeProperties.left += this.options.keyIndent;
     var key, val, type, i = 0, keys = this.hashSortedKeys( hash );
     for( ; i < keys.length; i++ ){
       key = keys[i];
@@ -172,8 +331,10 @@ HPropertyList = HControl.extend({
         this.addToken( type, key, val );
       }
     }
-    this.nodeProperties.left -= this.keyIndent;
+    this.nodeProperties.left -= this.options.keyIndent;
   },
+  
+  // Adds a taken
   addToken: function( type, name, value ){
     this.valueTokens.push( {
       top: this.nodeProperties.top,
@@ -182,11 +343,15 @@ HPropertyList = HControl.extend({
       name: name,
       value: value
     } );
-    this.nodeProperties.top += this.rowHeight;
+    this.nodeProperties.top += this.options.rowHeight;
   },
+  
+  // Returns type of item
   itemType: function( item ){
     return COMM.Values.type( item );
   },
+  
+  // Translation from type code to type name
   typeNames: {
     h: 'Hash',
     a: 'Array',
@@ -196,7 +361,11 @@ HPropertyList = HControl.extend({
     '~': 'Null',
     '-': 'Undefined'
   },
-  keyRowStyle: "position:absolute;z-index:1;right:0px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;",
+  
+  // Style for the key rows
+  keyRowStyle: "position:absolute;padding-top:2px;right:0px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;",
+  
+  // Creates row in key column
   addKeyColumnControl: function( token, i ){
     var elemId;
     if( i >= this.propertyItems.length ){
@@ -216,7 +385,11 @@ HPropertyList = HControl.extend({
     }
     ELEM.setHTML( elemId, token.name );
   },
-  typeRowStyle: "position:absolute;z-index:1;left:8px;width:72px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;",
+  
+  // Style for the type rows
+  typeRowStyle: "position:absolute;padding-top:2px;left:8px;width:72px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;",
+  
+  // Creates row in the type column
   addTypeColumnControl: function( token, i ){
     var elemId;
     if( i >= this.propertyItems.length ){
@@ -229,7 +402,11 @@ HPropertyList = HControl.extend({
     }
     ELEM.setHTML( elemId, this.typeNames[token.type] );
   },
-  valueRowStyle: "position:absolute;z-index:1;left:8px;right:0px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;",
+  
+  // Style for the value rows
+  valueRowStyle: "position:absolute;padding-top:2px;left:8px;right:0px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;",
+  
+  // Creates row in the value column
   addValueColumnControl: function( token, i ){
     var elemId, value;
     if( i >= this.propertyItems.length ){
@@ -261,14 +438,20 @@ HPropertyList = HControl.extend({
     }
     ELEM.setHTML( elemId, value );
   },
-  rowSeparatorStyle: "position:absolute;z-index:0;left:0px;right:0px;font-size:0px;height:1px;border-bottom:1px solid #ccc;overflow:hidden;text-overflow:ellipsis;",
+  
+  // Row separator style
+  rowSeparatorStyle: "position:absolute;left:1px;right:1px;font-size:0px;height:1px;overflow:hidden;border-bottom:1px solid #999;",
+  
+  // Adds row separator
   addRowSeparator: function( token, i, even ){
     if( i >= this.propertyItems.length ){
-      var elemId = ELEM.make( this.elemId );
+      var elemId = ELEM.make( this.separatortParentElemId );
       this.propertyItems.push( elemId );
-      ELEM.setCSS( elemId, 'top:'+token.top+'px;'+this.rowSeparatorStyle+'background-color:'+(even?'#eee':'#ddd')+';' );
+      ELEM.setCSS( elemId, 'top:'+token.top+'px;'+this.rowSeparatorStyle+'background-color:'+(even?'#f6f6f6':'#e6e6e6')+';' );
     }
   },
+  
+  // Destructor, deletes extra elements created
   die: function(){
     var
     i=0,
@@ -280,13 +463,53 @@ HPropertyList = HControl.extend({
     }
     this.base();
   },
+  
+  // Currently selected item
+  selectedItem: 0,
+  editNextItem: function(){
+    this.editItem(this.selectedItem+1);
+  },
+  editPrevItem: function(){
+    this.editItem(this.selectedItem-1);
+  },
+  editItem: function(itemNum){
+    
+    if(itemNum>this.valueTokens.length-1){
+      itemNum = this.valueTokens.length-1;
+    }
+    else if(itemNum < 0){
+      itemNum = 0;
+    }
+    
+    var
+    targetY = (itemNum*this.options.rowHeight)-1,
+    elem = ELEM.get( this.contentView.elemId ),
+    scrollTop = elem.scrollTop,
+    contentHeight = this.contentView.rect.height;
+    
+    if(targetY > (scrollTop+contentHeight-45)){
+      elem.scrollTop = scrollTop+45;
+    }
+    else if(targetY < scrollTop+45){
+      elem.scrollTop = scrollTop-45;
+    }
+    
+    this.selectedItem = itemNum;
+    this.editorValue.set(this.valueTokens[itemNum]);
+    this.editor.show();
+    EVENT.changeActiveControl(this.editor);
+    this.editor.offsetTo( 0, targetY );
+    this.editor.bringToFront();
+  },
+  
+  // Starts tokenizing, when the value is changed.
   refreshValue: function(){
     if(this['propertyItems']===undefined){
       return;
     }
     this.valueTokens = [];
     this.nodeProperties = {
-      top: 28,
+      top: 0,
       left: 8
     };
     var rootType = this.itemType( this.value );
@@ -299,6 +522,7 @@ HPropertyList = HControl.extend({
     else {
       this.addToken( rootType, 'Root', this.value );
     }
+    
     var i, token;
     if(this['propertyItems'] === undefined){
       this.propertyItems = [];
@@ -308,9 +532,11 @@ HPropertyList = HControl.extend({
       token = this.valueTokens[i];
       this.addRowSeparator( token, colId, (i%2===0) ); colId++;
       this.addKeyColumnControl( token, colId ); colId++;
-      this.addTypeColumnControl( token, colId ); colId++;
+      if(!this.options.hideTypeColumn){
+        this.addTypeColumnControl( token, colId ); colId++;
+      }
       this.addValueColumnControl( token, colId ); colId++;
-      colHeight = token.top+this.rowHeight;
+      colHeight = token.top+this.options.rowHeight;
     }
     var propItemsLen = this.propertyItems.length, elemId;
     for( i = colId; i < propItemsLen; i++ ){
@@ -318,11 +544,19 @@ HPropertyList = HControl.extend({
       ELEM.del( elemId );
     }
     this.keyColumn.bringToFront();
-    this.typeColumn.bringToFront();
+    if(!this.options.hideTypeColumn){
+      this.typeColumn.bringToFront();
+    }
     this.valueColumn.bringToFront();
     this.resizeColumns.bringToFront();
-    this.keyColumn.rect.setHeight( colHeight ); this.keyColumn.drawRect();
-    this.typeColumn.rect.setHeight( colHeight ); this.typeColumn.drawRect();
-    this.valueColumn.rect.setHeight( colHeight ); this.valueColumn.drawRect();
+    this.keyColumn.rect.setHeight( colHeight );
+    this.keyColumn.drawRect();
+    if(!this.options.hideTypeColumn){
+      this.typeColumn.rect.setHeight( colHeight );
+      this.typeColumn.drawRect();
+    }
+    this.valueColumn.rect.setHeight( colHeight );
+    this.valueColumn.drawRect();
+    ELEM.setStyle(this.separatortParentElemId,'height',(colHeight+25)+'px');
   }
 });

data/js/lists/propertylist/propertylisteditor/propertylisteditor.js

@@ -0,0 +1,180 @@
+/*   RSence
+ *   Copyright 2010 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
+  ** HPropertyListEditor is a subcomponent of HPropertyList that handles
+  ** editing of the selected row.
+  **
+  ***/
+var//RSence.Lists
+HPropertyListEditor = HControl.extend({
+  
+  defaultEvents: {
+    keyDown: 'repeat'
+  },
+  
+  keyDown: function(chr){
+    if(chr===38){
+      this.parent.parent.editPrevItem();
+    }
+    else if(chr===40){
+      this.parent.parent.editNextItem();
+    }
+    return true;
+  },
+  
+  refreshValue: function(){
+    
+    this.base();
+    
+    this.nameEditor.setValue(this.value.name);
+    
+    this.typeEditor && this.typeEditor.setValue( this.value.type );
+    
+    if(this.value.type === 's'){
+      this.stringEditor.show();
+      this.stringEditor.setValue(this.value.value);
+    }
+    else{
+      this.stringEditor.hide();
+    }
+    
+    if(this.value.type === 'n'){
+      this.numberEditor.show();
+      this.numberEditor.setValue(this.value.value);
+    }
+    else{
+      this.numberEditor.hide();
+    }
+    
+    this.resizeKeyColumn();
+  },
+  
+  
+  resizeKeyColumn: function(){
+    
+    var
+    parent = this.parent.parent,
+    nameEditor = this.nameEditor;
+    
+    nameEditor.rect.setLeft( this.value.left+6 );
+    nameEditor.rect.setRight( parent.keyColumnRight()-3 );
+    nameEditor.refresh();
+    
+    var
+    stringEditor = this.stringEditor;
+    numberEditor = this.numberEditor;
+    
+    stringEditor.rect.setLeft( parent.valueColumnLeft()+5 );
+    numberEditor.rect.setLeft( parent.valueColumnLeft()+4 );
+    
+    if(this['typeEditor']){
+      var
+      typeEditor = this.typeEditor;
+      
+      typeEditor.rect.setLeft( parent.typeColumnLeft()+2 );
+      typeEditor.rect.setRight( parent.typeColumnRight()-1 );
+      typeEditor.drawRect();
+    }
+    
+    stringEditor.drawRect();
+    numberEditor.drawRect();
+  },
+  nameEditor: null,
+  typeEditor: null,
+  valueEditor: null,
+  drawSubviews: function(){
+    
+    this.setStyle('border-top','1px solid #999');
+    this.setStyle('border-bottom','1px solid #999');
+    
+    var
+    _stateElemId = ELEM.make( this.elemId );
+    this.markupElemIds = { state: _stateElemId };
+    ELEM.setCSS( _stateElemId, 'position:absolute;left:0;top:0;right:0;bottom:0;background-color:#fff;' );
+    ELEM.setStyle( _stateElemId, 'opacity', 0.8 );
+    
+    var
+    parent = this.parent.parent,
+    opts = parent.options;
+    
+    this.nameEditor = HTextControl.extend({
+      boldTypes: ['a','h'],
+      refreshValue: function(){
+        if(this.drawn){
+          if(this.boldTypes.indexOf(this.parent.value.type)!==-1){
+            this.setStyle('font-weight','bold',true);
+          }
+          else{
+            this.setStyle('font-weight','normal',true);
+          }
+        }
+        this.base();
+      }
+    }).nu(
+      [0,-1,1,opts.rowHeight+4],
+      this, {
+        style: [
+          [ 'font-size', '11px' ],
+          [ 'text-indent', '1px' ]
+        ]
+      }
+    );
+    
+    var
+    height = this.nameEditor.rect.height;
+    
+    if(!opts.hideTypeColumn){
+      this.typeEditor = HMiniMenu.nu(
+        [0,1,1,height],
+        this, {
+          value: 'a',
+          menuItemGeom: {
+            width: 75,
+            left: -15
+          }
+        }
+      );
+      
+      var _arrTypes = [];
+      
+      for( var i in parent.typeNames ){
+        _arrTypes.push( [i, parent.typeNames[i]] );
+      }
+      
+      this.typeEditor.setListItems( _arrTypes );
+      
+    }
+    
+    this.stringEditor = HTextArea.extend({
+    }).nu(
+      [0,-1,null,height,4,null],
+      this, {
+        style: [
+          [ 'font-size', '11px' ],
+          [ 'text-indent', '1px' ],
+          [ 'padding-top', '3px' ]
+        ]
+      }
+    );
+    
+    this.numberEditor = HNumericTextControl.extend({
+    }).nu(
+      [0,-1,null,height,4,null],
+      this, {
+        style: [
+          [ 'font-size', '11px' ],
+          [ 'text-indent', '1px' ]
+        ]
+      }
+    );
+    
+    this.resizeKeyColumn();
+    
+  }
+});

data/js/lists/radiobuttonlist/radiobuttonlist.js

@@ -51,17 +51,21 @@ HRadioButtonList = HControl.extend({
       _listItem = _listItems[i];
       _value = _listItem[0];
       _label = _listItem[1];
-      _radioButton = HRadiobutton.nu(
-        [ 4, (i*23)+4, null, 23, 4, null ],
-        this, {
-          label: _label
-        }
-      );
-      this.listItemViews[i] = _radioButton;
+      _component = this.createComponent( i, _label );
+      this.listItemViews[i] = _component;
     }
     this.refreshValue();
   },
   
+  createComponent: function( i, _label ){
+    return HRadiobutton.nu(
+      [ 4, (i*23)+4, null, 23, 4, null ],
+      this, {
+        label: _label
+      }
+    );
+  },
+  
 /** = Description
   * Destructor. Sets listItems and listItemViews to null and initiates
   * destructor for radioButtonIndexValue.
@@ -91,6 +95,9 @@ HRadioButtonList = HControl.extend({
       }
     }
   }),
+  
+  
+  
   refreshValue: function(){
     var _value = this.value;
     if ( this.listItems.length !== 0 && this['valueMatrix'] !== undefined ) {

data/js/menus/minimenu/minimenu.js

@@ -0,0 +1,115 @@
+/*   RSence
+ *   Copyright 2010 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
+  ** Simple small menu component for selecting one value amongst several.
+  ** It's limited to 15px height by the default theme.
+  ***/
+var//RSence.Menus
+HMiniMenu = HRadioButtonList.extend({
+  
+  componentName: 'minimenu',
+  
+  defaultEvents: {
+    mouseDown: true,
+    mouseUp: true,
+    click: true
+  },
+  
+  repositionMenuItems: function(){
+    var
+    x = this.pageX(),
+    y = this.pageY(),
+    w = this.rect.width,
+    h = this.listItems.length*15,
+    i = 0,
+    listItem = null;
+    for(;i<this.listItems.length && listItem === null;i++){
+      if(this.listItems[i][0]===this.value){
+        listItem = this.listItems[i];
+      }
+    }
+    y -= (i-1)*15;
+    if(y < 0){
+      y = y%15;
+    }
+    if(this.options['menuItemGeom']){
+      if(this.options.menuItemGeom.width){
+        w += this.options.menuItemGeom.width;
+      }
+      if(this.options.menuItemGeom.width){
+        x += this.options.menuItemGeom.left;
+      }
+    }
+    this.menuItemView.rect.set( x, y, x+w, y+h );
+    this.menuItemView.refresh();
+  },
+  
+  click: function(){
+    this.mouseDown();
+  },
+  
+  refreshValue: function(){
+    this.base();
+    for(var i=0;i<this.listItems.length;i++){
+      if(this.listItems[i][0]===this.value){
+        this.setLabel( this.listItems[i][1] );
+        break;
+      }
+    }
+  },
+  
+  mouseDown: function(){
+    this.repositionMenuItems();
+    this.menuItemView.bringToFront();
+    this.menuItemView.show();
+    return true;
+  },
+  
+  lostActiveStatus: function(newActive){
+    this.base(newActive);
+    if((newActive.parent !== this.menuItemView) && (newActive !== this.menuItemView)){
+      this.menuItemView.hide();
+    }
+  },
+  
+  die: function(){
+    this.menuItemView.die();
+    this.base();
+  },
+  
+  drawSubviews: function(){
+    this.menuItemView = HView.extend({
+      drawSubviews: function(){
+        this.setStyle( 'background-color','#f6f6f6' );
+        this.setStyle( 'border', '1px solid #999' );
+      }
+    }).nu(
+      [ this.rect.left, this.rect.top, this.rect.width, 500 ],
+      this.app, {
+        visible: false
+      }
+    );
+  },
+  
+  setListItems: function(listItems){
+    this.base(listItems);
+    this.valueMatrix = this.menuItemView.valueMatrix;
+  },
+  
+  createComponent: function( i, _label ){
+    return HMiniMenuItem.nu(
+      [ 0, (i*15), null, 15, 0, null ],
+      this.menuItemView, {
+        label: _label
+      }
+    );
+  }
+  
+});

data/js/menus/minimenu/minimenuitem/minimenuitem.js

@@ -0,0 +1,33 @@
+/*   RSence
+ *   Copyright 2010 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
+  ** Menu item for the HMiniMenu component.
+  ***/
+var//RSence.Menus
+HMiniMenuItem = HRadioButton.extend({
+  
+  componentName: 'minimenuitem',
+  
+  defaultEvents: {
+    click: true,
+    mouseUp: true
+  },
+  
+  click: function(){
+    this.base();
+    this.parent.hide();
+  },
+  
+  mouseUp: function(){
+    this.base();
+    this.click();
+  }
+  
+});

data/js/menus/minimenu/minimenuitem/themes/default/minimenuitem.css

@@ -0,0 +1,45 @@
+
+.minimenuitem_control,
+.minimenuitem_label,
+.minimenuitem_state {
+  position: absolute;
+  top: 0px; height: 15px;
+}
+
+.minimenuitem_control {
+  left: 0px; right: 0px;
+  cursor: pointer;
+}
+.minimenuitem_control:hover {
+  background-color: #fff;
+}
+
+.minimenuitem_state {
+  left: 0px; top: 1px; height: 12px; width: 12px;
+  background-image: #{this.getCssFilePath('minimenuitem_checkmark.png')};
+}
+.checked .minimenuitem_state {
+  visibility: inherit;
+}
+.unchecked .minimenuitem_state {
+  visibility: hidden;
+}
+
+.minimenuitem_label {
+  left: 14px; right: 11px; top: 0px;
+  height: 15px; line-height: 15px;
+  text-align: left;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space:nowrap;
+  vertical-align: middle;
+  font-family: Arial, sans-serif;
+  font-size: 11px;
+  color: #333;
+}
+.minimenuitem_control:hover > .minimenuitem_label {
+  color: #000;
+}
+.disabled .minimenuitem_control {
+  opacity: 0.8;
+}

data/js/menus/minimenu/minimenuitem/themes/default/minimenuitem.html

@@ -0,0 +1,4 @@
+<div class="minimenuitem_control#{this.value?' checked':' unchecked'}" id="control#{_ID}">
+  <div class="minimenuitem_state" id="state#{_ID}"></div>
+  <div class="minimenuitem_label" id="label#{_ID}">#{this.label}</div>
+</div>

data/js/menus/minimenu/themes/default/minimenu.css

@@ -0,0 +1,63 @@
+
+.minimenu_control,
+.minimenu_edge_left,
+.minimenu_center,
+.minimenu_edge_right,
+.minimenu_label,
+.minimenu_antiselect {
+  position: absolute;
+  top: 0px; height: 15px;
+}
+
+.minimenu_control {
+  left: 0px; right: 0px;
+  cursor: pointer;
+}
+.disabled .minimenu_control {
+  cursor: default;
+}
+
+.minimenu_edge_left,
+.minimenu_center,
+.minimenu_edge_right {
+  background-image: #{this.getCssFilePath('minimenu.png')};
+}
+
+.minimenu_edge_left {
+  left: 0px; width: 7px;
+  background-position: 0px 0px;
+}
+
+.minimenu_edge_right {
+  right: 0px; width: 13px;
+  background-position: -7px 0px;
+}
+
+.minimenu_center {
+  left: 7px; right: 13px;
+  background-position: 0px -15px;
+  background-repeat: repeat-x;
+}
+
+.minimenu_label {
+  left: 6px; right: 11px; top: 0px;
+  height: 15px; line-height: 15px;
+  text-align: left;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space:nowrap;
+  vertical-align: middle;
+  font-family: Arial, sans-serif;
+  font-size: 11px;
+  color: #333;
+}
+.minimenu_control:hover > .minimenu_label {
+  color: #000;
+}
+.disabled .minimenu_control {
+  opacity: 0.8;
+}
+
+.minimenu_antiselect {
+  left: 0px; right: 0px;
+}

data/js/menus/minimenu/themes/default/minimenu.html

@@ -0,0 +1,7 @@
+<div class="minimenu_control" id="control#{_ID}">
+  <div class="minimenu_edge_left"></div>
+  <div class="minimenu_center"></div>
+  <div class="minimenu_edge_right"></div>
+  <div class="minimenu_label" id="label#{_ID}">#{this.label}</div>
+  <div class="minimenu_antiselect"></div>
+</div>

data/lib/daemon/daemon.rb

@@ -269,9 +269,18 @@ module RSence
   # @private  Simple process control, constructed here and called from Daemon::Controller
   class HTTPDaemon
     
+    def ps_name
+      config = RSence.config
+      url = "http://#{config[:http_server][:bind_address]}:#{config[:http_server][:port]}#{config[:base_url]}"
+      env_path = RSence.args[:env_path]
+      "RSence-#{RSence.version} on #{url} in #{env_path}"
+    end
+    
     # RSence top-level run handler. Almost identical to start.
     def run
-    
+      
+      $0 = ps_name
+      
       puts "Starting as a foreground process." if RSence.args[:verbose]
       puts "Press CTRL-C to terminate."
     
@@ -313,7 +322,9 @@ module RSence
     
     # Called by Controller#start, contains RSence-specific operations
     def start
-    
+      
+      $0 = ps_name
+      
       @transporter = Transporter.new
     
       conf = RSence.config[:http_server]

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rsence-pre
 version: !ruby/object:Gem::Version 
-  hash: 961916148
+  hash: 961916156
   prerelease: true
   segments: 
   - 2
   - 1
   - 0
-  - 4
+  - 6
   - pre
-  version: 2.1.0.4.pre
+  version: 2.1.0.6.pre
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-05 00:00:00 +03:00
+date: 2010-09-09 00:00:00 +03:00
 default_executable: rsence-pre
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -340,8 +340,20 @@ files:
 - js/lists/listitems/listitems.js
 - js/lists/propertylist/js.inc
 - js/lists/propertylist/propertylist.js
+- js/lists/propertylist/propertylisteditor/js.inc
+- js/lists/propertylist/propertylisteditor/propertylisteditor.js
 - js/lists/radiobuttonlist/js.inc
 - js/lists/radiobuttonlist/radiobuttonlist.js
+- js/menus/minimenu/js.inc
+- js/menus/minimenu/minimenu.js
+- js/menus/minimenu/minimenuitem/js.inc
+- js/menus/minimenu/minimenuitem/minimenuitem.js
+- js/menus/minimenu/minimenuitem/themes/default/minimenuitem.css
+- js/menus/minimenu/minimenuitem/themes/default/minimenuitem.html
+- js/menus/minimenu/minimenuitem/themes/default/minimenuitem_checkmark.png
+- js/menus/minimenu/themes/default/minimenu.css
+- js/menus/minimenu/themes/default/minimenu.html
+- js/menus/minimenu/themes/default/minimenu.png
 - js/util/reloadapp/js.inc
 - js/util/reloadapp/reloadapp.js
 - js/util/reloadapp/themes/default/reloadapp_warning-ie6.gif