rsence 2.1.11 → 2.2.0

data/js/lists/listitems/listitems.js

@@ -27,6 +27,13 @@ var//RSence.Lists
 HListItems = HValueResponder.extend({
   
   constructor: function( _rect, _parent, _options ){
+    if( _rect.hasAncestor && _rect.hasAncestor( HView ) ){
+      _options = _parent;
+      _parent = _rect;
+    }
+    else {
+      console.warn && console.warn( "Warning: the rect constructor argument of HListItems is deprecated." );
+    }
     this.parent = _parent;
     if ( this.parent.setListItemResponder ){
       this.parent.setListItemResponder( this );
@@ -35,10 +42,10 @@ HListItems = HValueResponder.extend({
       console.log('Warning; parent does not respond to setListItemResponder');
     }
     if (_options instanceof Object) {
-      if (_options['valueObj'] !== undefined) {
+      if (_options.valueObj !== undefined) {
         _options.valueObj.bind( this );
       }
-      else if(_options['value'] !== undefined) {
+      else if(_options.value !== undefined) {
         this.value = _options.value;
         this.refresh();
       }
@@ -54,10 +61,6 @@ HListItems = HValueResponder.extend({
     _this.value = null;
   },
   
-  _warningMessage: function(_messageText){
-    console.log("Warning; HListItems: "+_messageText);
-  },
-  
 /** = Description
   * Iterates through this.value array and calls
   * the setListItems function of the parent class.
@@ -65,40 +68,51 @@ HListItems = HValueResponder.extend({
   **/
   refresh: function(){
     if ( this.value instanceof Array ) {
-      var _listItems = [],
-          _row, _rowType,
-          _label, _value,
-          i = 0;
-      for ( ; i < this.value.length ; i++ ){
-        _row = this.value[i];
-        _rowType = COMM.Values.type( _row );
-        // console.log('row:',_row,' rowType:',_rowType);
-        // hashes
-        if ( _rowType === 'h' ) {
-          _label = _row['label'];
-          _value = _row['value'];
-          if ( _label === undefined || _value === undefined ){
-            this._warningMessage( "The value or label of row "+_row+" is undefined (ignored)" );
-          }
-          _listItems.push( [_value, _label] );
-        }
-        // Arrays as-is
-        else if ( _rowType == 'a' ){
-          _listItems.push( _row );
-        }
-        // strings and integers
-        else if ( ['s','n'].indexOf(_rowType) !== -1 ){
-          _label = _row.toString();
-          _value = _row;
-          _listItems.push( [_value, _label] );
-        }
-        else {
-          this._warningMessage( "The row "+_row+" is has unsupported row type: '"+_rowType+"' (ignored)" );
-        }
-      }
-      this.parent.setListItems( _listItems );
+      this.parent.setListItems( this.value );
     }
   }
 });
 
+var
+HListItemControl = HControl.extend({
 
+  _cleanListItems: function(_listItemsIn){
+    var _listItems = [],
+        _row, _rowType,
+        _label, _value,
+        i = 0;
+    for ( ; i < _listItemsIn.length ; i++ ){
+      _row = _listItemsIn[i];
+      _rowType = COMM.Values.type( _row );
+      // console.log('row:',_row,' rowType:',_rowType);
+      // hashes
+      if ( _rowType === 'h' ) {
+        _label = _row.label;
+        _value = _row.value;
+        if ( _label === undefined || _value === undefined ){
+          console.log( "The value or label of row "+_row+" is undefined (ignored)" );
+        }
+        _listItems.push( [_value, _label] );
+      }
+      // Arrays as-is
+      else if ( _rowType == 'a' ){
+        _listItems.push( _row );
+      }
+      // strings and integers
+      else if ( ['s','n'].indexOf(_rowType) !== -1 ){
+        _label = _row.toString();
+        _value = _row;
+        _listItems.push( [_value, _label] );
+      }
+      else {
+        console.log( "The row "+_row+" has an unsupported row type: '"+_rowType+"' (ignored)" );
+      }
+    }
+    return _listItems;
+  },
+
+  setListItems: function( _listItems ){
+    _listItems = this._cleanListItems(_listItems);
+  }
+
+});

data/js/lists/radiobuttonlist/radiobuttonlist.js

@@ -11,9 +11,10 @@
   ** The value of the instance is the selected key in the listItems.
   ***/
 var//RSence.Lists
-HRadioButtonList = HControl.extend({
+HRadioButtonList = HListItemControl.extend({
   drawSubviews: function(){
-    this.setStyle('border','1px solid #999');
+    this.setStyle('border','1px solid #999999');
+    this.setStyle('border-radius','3px');
     this.setStyle('overflow-y','auto');
   },
   listItems: [],
@@ -32,6 +33,7 @@ HRadioButtonList = HControl.extend({
   *
   **/
   setListItems: function(_listItems){
+    _listItems = this._cleanListItems(_listItems);
     var _listItem,
         _value,
         _label,
@@ -61,7 +63,8 @@ HRadioButtonList = HControl.extend({
     return HRadiobutton.nu(
       [ 4, (i*23)+4, null, 23, 4, null ],
       this, {
-        label: _label
+        label: _label,
+        enabled: this.enabled
       }
     );
   },
@@ -83,8 +86,10 @@ HRadioButtonList = HControl.extend({
     }
     this.radioButtonIndexValue && this.radioButtonIndexValue.die();
     this.listItems = null;
-    for(var i=0;i<this.listItemViews.length;i++){
-      this.listItemViews[i].die();
+    if( this.listItemViews ){
+      for(var i=0;i<this.listItemViews.length;i++){
+        this.listItemViews[i].die();
+      }
     }
     this.listItemViews = null;
     this.radioButtonIndexValue && this.radioButtonIndexValue.die();
@@ -92,6 +97,13 @@ HRadioButtonList = HControl.extend({
   },
   radioButtonIndexValue: false,
   radioButtonResponder: false,
+  setEnabled: function(_state){
+    this.base(_state);
+    if(!this['listItemViews']){ return; }
+    for(var i=0;i<this.listItems.length;i++){
+      this.listItemViews[i].setEnabled(_state)
+    }
+  },
   
 /** = Description
   * 
@@ -102,12 +114,15 @@ HRadioButtonList = HControl.extend({
       this.parent = _parent;
     },
     refresh: function(){
-      var _listItems = this.parent.listItems;
+      var
+      _listItems = this.parent.listItems,
+      _value;
       if(_listItems === undefined || _listItems === null){
         return;
       }
       if(_listItems[ this.value ] !== undefined){
-        this.parent.setValue( _listItems[ this.value ][0] );
+        _value = _listItems[ this.value ];
+        this.parent.setValue( _value[0] );
       }
     }
   }),
@@ -117,6 +132,7 @@ HRadioButtonList = HControl.extend({
   refreshValue: function(){
     var _value = this.value;
     if ( this.listItems && this.listItems.length !== 0 && this['valueMatrix'] !== undefined ) {
+      // debugger;
       if ( this.radioButtonResponder === false ){
         this.radioButtonIndexValue = HValue.nu( false, 0 );
         this.radioButtonIndexValue.bind( this.valueMatrix );

data/js/menus/menuitem/menuitem.js

@@ -0,0 +1,5 @@
+
+var
+HMenuItem = HMiniMenuItem.extend({
+  componentName: 'menuitem'
+});

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

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

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

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

data/js/menus/minimenu/minimenu.js

@@ -18,7 +18,14 @@ HMiniMenu = HRadioButtonList.extend({
   
   defaultEvents: {
     draggable: true,
-    click: true
+    click: true,
+    resize: true
+  },
+
+  subComponentHeight: 15,
+
+  resize: function(){
+    this.repositionMenuItems();
   },
   
   repositionMenuItems: function(){
@@ -26,7 +33,7 @@ HMiniMenu = HRadioButtonList.extend({
     x = this.pageX(),
     y = this.pageY(),
     w = this.rect.width,
-    h = this.listItems.length*15,
+    h = this.listItems.length*this.subComponentHeight,
     i = 0,
     listItem = null;
     for(;i<this.listItems.length && listItem === null;i++){
@@ -34,9 +41,9 @@ HMiniMenu = HRadioButtonList.extend({
         listItem = this.listItems[i];
       }
     }
-    y -= (i-1)*15;
+    y -= (i-1)*this.subComponentHeight;
     if(y < 0){
-      y = y%15;
+      y = this.subComponentHeight%y;
     }
     if(this.options['menuItemGeom']){
       if(this.options.menuItemGeom.width){
@@ -52,6 +59,7 @@ HMiniMenu = HRadioButtonList.extend({
   
   click: function(){
     this.menuShow();
+    return false;
   },
   
   refreshValue: function(){
@@ -81,10 +89,20 @@ HMiniMenu = HRadioButtonList.extend({
   startDrag: function(x,y){
     this.dragStart = [x,y];
     this.menuShow();
+    return false;
   },
   
-  lostActiveStatus: function(newActive){
-    this.menuHide();
+  lostActiveStatus: function(_newActive){
+    // console.log('menu lost active status',_newActive);
+    if( !_newActive.isChildOf( this.menuItemView ) ){
+      this.menuHide();
+    }
+    this.base(_newActive);
+  },
+  
+  gainedActiveStatus: function(_prevActive){
+    // console.log('menu gained active status',_prevActive);
+    this.base(_prevActive);
   },
   
   endDrag: function(x,y){
@@ -96,39 +114,52 @@ HMiniMenu = HRadioButtonList.extend({
     else {
       this.menuHide();
     }
+    return false;
   },
   
   die: function(){
     this.valueMatrix = null;
     var _menuItemView = this.menuItemView;
     this.base();
-    _menuItemView && _menuItemView.die();
+    if( _menuItemView ){
+      _menuItemView.die();
+    }
   },
   
   drawSubviews: function(){
+    var
+    itemStyle = {
+      'background-color': '#f6f6f6',
+      'border': '1px solid #999',
+      'overflow': 'auto',
+      'overflow-x': 'hidden'
+    };
+    if(!BROWSER_TYPE.ie){
+      itemStyle.opacity = 0.9;
+    }
     this.menuItemView = HView.nu(
       [ this.rect.left, this.rect.top, this.rect.width, 10 ],
       this.app, {
         visible: false,
-        style: [
-          ['background-color','#f6f6f6'],
-          ['border', '1px solid #999'],
-          ['overflow-y', 'auto'],
-          ['opacity', 0.9]
-        ]
+        style: itemStyle,
+        logicParent: this
       }
     );
   },
   
-  setListItems: function(listItems){
-    this.base(listItems);
+  setListItems: function(_listItems){
+    this.base(_listItems);
     this.valueMatrix = this.menuItemView.valueMatrix;
     this.refreshValue();
+    if( this.options.initialVisibility ){
+      EVENT.changeActiveControl(this);
+      this.menuShow();
+    }
   },
   
   createComponent: function( i, _label ){
     return HMiniMenuItem.nu(
-      [ 0, (i*15), null, 15, 0, null ],
+      [ 0, (i*this.subComponentHeight), null, this.subComponentHeight, 0, null ],
       this.menuItemView, {
         label: _label
       }

data/js/menus/minimenuitem/minimenuitem.js

@@ -0,0 +1,62 @@
+/*   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,
+    mouseDown: true
+  },
+  
+  _activateParentParent: function(){
+    var _parentParent = this.parent.options.logicParent;
+    EVENT.changeActiveControl(_parentParent);
+  },
+
+  // gainedActiveStatus: function( _prevActive ){
+  //   console.log('menuitem gained active status',_prevActive === this.parent.options.logicParent);
+  //   this.base( _prevActive );
+  // },
+
+  lostActiveStatus: function( _newActive ){
+    this.parent.options.logicParent.menuHide();
+    this.base( _newActive );
+  },
+
+  _parentLastActivation: 0,
+  click: function(){
+    var _now = new Date().getTime();
+    if( _now - this._parentLastActivation > 200 ){
+      this.base();
+      this._parentLastActivation = _now;
+      this._activateParentParent();
+    }
+    return true;
+  },
+  
+  mouseDown: function(){
+    this.base();
+    this.click();
+    return true;
+  },
+  
+  mouseUp: function(){
+    this.base();
+    this.click();
+    return true;
+  }
+  
+});