rsence-pre 3.0.0.8 → 3.0.0.9

data/client/js/foundation/view/view.js

@@ -26,6 +26,7 @@ HView = UtilMethods.extend({
 
   isView: true,  // attribute to check if the object is a view
   isCtrl: false, // attribute to check for if the object is a control
+  isDead: false, // attribute to check for killed object references
 
 /** Component specific theme path.
   **/
@@ -294,13 +295,17 @@ HView = UtilMethods.extend({
   *
   **/
   constructor: function(_rect, _parent, _options) {
+
+    // destructable timeouts:
+    this.timeouts = [];
+
     if( !_options ){
       _options = {};
     }
     if(!this.isinherited){
       _options = (this.viewDefaults.extend(_options)).nu(this);
     }
-
+    if( typeof this.customOptions === 'function' ){ this.customOptions( _options ); }
     this.options = _options;
     this.label = _options.label;
 
@@ -317,7 +322,7 @@ HView = UtilMethods.extend({
       this.preserveTheme = true;
     }
 
-    if(_options.visible === false) {
+    if(_options.visible === false || _options.hidden === true) {
       this.isHidden = true;
     }
 
@@ -346,7 +351,7 @@ HView = UtilMethods.extend({
     // deleted from the element manager when the view gets destroyed.
     this._domElementBindings = [];
 
-    if(!this.isinherited) {
+    if(!this.isinherited && this.options.autoDraw) {
       this.draw();
     }
   },
@@ -539,24 +544,6 @@ HView = UtilMethods.extend({
     ELEM.setAttr( this.elemId, 'elem_id', this.elemId, true );
   },
 
-/** --
-  * = Description
-  * The _setCSS method does the initial styling of the element.
-  * It's a separate method to ease creating component that require
-  * other initial styles.
-  * ++
-  **/
-  _setCSS: function(_additional){
-    var _cssStyle = 'overflow:hidden;visibility:hidden;';
-    if(this.isAbsolute){
-      _cssStyle += 'position:absolute;';
-    } else {
-      _cssStyle += 'position:relative;';
-    }
-    _cssStyle += _additional;
-    ELEM.setCSS(this.elemId,_cssStyle);
-  },
-
 /** --
   * = Description
   * The _getParentElemId method returns the ELEM ID of the parent.
@@ -607,7 +594,12 @@ HView = UtilMethods.extend({
     if(!this.elemId) {
 
       this._makeElem(this._getParentElemId());
-      this._setCSS('');
+
+      ELEM.setStyle(this.elemId,'overflow','hidden',true);
+      ELEM.setStyle(this.elemId,'visibility','hidden',true);
+
+      if(this.isAbsolute){   ELEM.setStyle(this.elemId,'position','absolute'); }
+      else {                 ELEM.setStyle(this.elemId,'position','relative'); }
 
       // Theme name == CSS class name
       if(this.preserveTheme){
@@ -616,6 +608,9 @@ HView = UtilMethods.extend({
       else {
         ELEM.addClassName( this.elemId, HThemeManager.currentTheme );
       }
+      if( this.componentName !== undefined ){
+        ELEM.addClassName( this.elemId, this.componentName );
+      }
       if( this.options.textSelectable !== undefined ){
         this.textSelectable = this.options.textSelectable;
       }
@@ -730,10 +725,10 @@ HView = UtilMethods.extend({
         ELEM.setStyle( this._ieNoThrough, 'opacity', 0.01 );
       }
       if(this.options.style){
-        this.setStyles( this.options.style );
+        this.setStyles( this.options.style ); // optimize
       }
       if(this.options.html){
-        this.setHTML(this.options.html);
+        this.setHTML(this.options.html); // optimize
       }
       // Extended draw for components to define / extend.
       // This is preferred over drawSubviews, when defining
@@ -757,6 +752,7 @@ HView = UtilMethods.extend({
         this.show();
       }
     }
+    _timeI = 10;
     this.refresh();
     return this;
   },
@@ -813,32 +809,57 @@ HView = UtilMethods.extend({
   },
 
 /** = Description
-  * Sets or unsets the _cssClass into a DOM element that goes by the ID
-  * _elementId.
+  * Sets or unsets the _className into a DOM element that goes by the ID
+  * _elemId.
   *
   * = Parameters
-  * +_elementId+:: ID of the DOM element, or the element itself, to be
+  * +_elemId+:: ID of the DOM element, or the element itself, to be
   *                modified.
-  * +_cssClass+::  Name of the CSS class to be added or removed.
-  * +_setOn+::     Boolean value that tells should the CSS class be added or
-  *                removed.
+  * +_className+::  Name of the CSS class to be added or removed.
+  * +_state+::     Boolean value that tells should the CSS class be added or
+  *                removed. If undefined or null, toggles the current state.
   *
   * = Returns
   * +self+
   *
   **/
-  toggleCSSClass: function(_elementId, _cssClass, _setOn) {
-    if(_elementId) {
-      if (_setOn) {
-        ELEM.addClassName(_elementId, _cssClass);
+  toggleCSSClass: function(_elemId, _className, _state) {
+    if(_elemId !== null && _elemId !== undefined) {
+      // if(_elemId == 920){debugger;}
+      if (this.typeChr(_elemId) === 's'){
+        _elemId = this.markupElemIds[_elemId];
+      }
+      if (_state === null || _state === undefined ){
+        _state = !ELEM.hasClassName(_elemId,_className);
+      }
+      if (_state) {
+        ELEM.addClassName(_elemId, _className);
       }
       else {
-        ELEM.delClassName(_elementId, _cssClass);
+        ELEM.delClassName(_elemId, _className);
       }
     }
     return this;
   },
 
+  setCSSClass: function( _className, _other ){
+    if(_other){
+      this.toggleCSSClass( _className, _other, true );
+    }
+    else{
+      this.toggleCSSClass( this.elemId, _className, true );
+    }
+  },
+
+  unsetCSSClass: function( _className, _other ){
+    if(_other){
+      this.toggleCSSClass( _className, _other, false );
+    }
+    else{
+      this.toggleCSSClass( this.elemId, _className, false );
+    }
+  },
+
 /** = Description
   * Replaces the contents of the view's DOM element with custom html.
   *
@@ -918,7 +939,7 @@ HView = UtilMethods.extend({
     if( this.themeStyle !== undefined && typeof this.themeStyle === 'function' ){
       this.themeStyle.call(this);
     }
-    if(this.optimizeWidthOnRefresh && this.options.pack) {
+    if(this.optimizeWidthOnRefresh && this.options.pack && this.drawn) {
       this.optimizeWidth();
     }
     return this;
@@ -1254,7 +1275,12 @@ HView = UtilMethods.extend({
       !this.isProduction && console.log('Warning, setStyleOfPart: partName "'+_partName+'" does not exist for viewId '+this.viewId+'.');
     }
     else {
-      ELEM.setStyle(this.markupElemIds[_partName], _name, _value, _force);
+      if( this.typeChr(_name) === 'h'){
+        ELEM.setStyles(this.markupElemIds[_partName], _name );
+      }
+      else{
+        ELEM.setStyle(this.markupElemIds[_partName], _name, _value, _force);
+      }
     }
     return this;
   },
@@ -1508,14 +1534,24 @@ HView = UtilMethods.extend({
   *
   **/
   die: function() {
+    if(this.isDead && !this.isProduction){
+      console.warn('double kill!');
+      return;
+    }
+    this.isDead = true;
     // hide self, makes destruction seem faster
     this.hide();
     this.drawn = false;
     this.stopAnimation();
+    if( this.timeouts ){
+      while( this.timeouts.length ){ clearTimeout(this.timeouts.pop()); }
+      delete this.timeouts;
+    }
     // Delete the children first.
     var _childViewId, i;
-    if(!this.views && !this.isProduction){
+    if(!this.views){
       console.log('HView#die: no sub-views for component name: ',this.componentName,', self:',this);
+      return;
     }
     while (this.views && this.views.length !== 0) {
       _childViewId = this.views[0];
@@ -1922,31 +1958,34 @@ HView = UtilMethods.extend({
   * +_elemId+::   Optional, The element ID where the temporary string is created
   *               in.
   * +_wrap+::     Optional boolean value, wrap white-space?
-  * +_extraCss+:: Optional, extra css to add.
+  * +_customStyle+:: Optional, extra css to add.
   *
   * = Returns
   * The width in pixels required to draw a string in the font.
   *
   **/
-  stringSize: function(_string, _length, _elemId, _wrap, _extraCss) {
+  stringSize: function(_string, _length, _elemId, _wrap, _customStyle) {
+    if(!_customStyle){_customStyle = {};}
+    if(this.typeChr(_customStyle) === 's'){
+      console.warn("#stringSize: use styles instead of css text!");
+      _customStyle = {};
+    }
     if (_length || _length === 0) {
       _string = _string.substring(0, _length);
     }
     if (!_elemId && _elemId !== 0) {
-      _elemId = 0; //this.elemId;
-    }
-    if (!_extraCss) {
-      _extraCss = '';
+      _elemId = 0;
     }
+    _customStyle.visibility = 'hidden';
     if (!_wrap){
-      _extraCss += 'white-space:nowrap;';
+      _customStyle.whiteSpace = 'nowrap';
     }
     var
     _stringParent = ELEM.make(_elemId,'div'),
     _stringElem = ELEM.make(_stringParent,'span');
-    ELEM.setCSS(_stringElem, "visibility:hidden;"+_extraCss);
+    ELEM.setStyles(_stringElem, _customStyle);
     ELEM.setHTML(_stringElem, _string);
-    ELEM.flushLoop();
+    ELEM.flushElem([_stringParent,_stringElem]);
     var _visibleSize=ELEM.getSize(_stringElem);
     ELEM.del(_stringElem); ELEM.del(_stringParent);
     return [_visibleSize[0]+_visibleSize[0]%2,_visibleSize[1]+_visibleSize[1]%2];
@@ -1954,14 +1993,14 @@ HView = UtilMethods.extend({
 
 /** Returns the string width
   **/
-  stringWidth: function(_string, _length, _elemId, _extraCss){
-    return this.stringSize(_string, _length, _elemId, false, _extraCss)[0];
+  stringWidth: function(_string, _length, _elemId, _customStyle){
+    return this.stringSize(_string, _length, _elemId, false, _customStyle)[0];
   },
 
   /** Returns the string height.
     **/
-  stringHeight: function(_string, _length, _elemId, _extraCss){
-    return this.stringSize(_string, _length, _elemId, true, _extraCss)[1];
+  stringHeight: function(_string, _length, _elemId, _customStyle){
+    return this.stringSize(_string, _length, _elemId, true, _customStyle)[1];
   },
 
 /** Returns the X coordinate that has the scrolled position calculated.
@@ -2068,14 +2107,14 @@ HView = UtilMethods.extend({
   * nodes from the cache.
   *
   * = Parameters
-  * +_elementId+:: The id of the element in the element manager's cache
+  * +_elemId+:: The id of the element in the element manager's cache
   *                that is to be removed from the cache.
   *
   **/
-  unbindDomElement: function(_elementId) {
-    var _indexOfElementId = this._domElementBindings.indexOf(_elementId);
+  unbindDomElement: function(_elemId) {
+    var _indexOfElementId = this._domElementBindings.indexOf(_elemId);
     if (~_indexOfElementId) {
-      ELEM.del(_elementId);
+      ELEM.del(_elemId);
       this._domElementBindings.splice(_indexOfElementId, 1);
     }
   },

data/client/js/foundation/view/viewdefaults/viewdefaults.js

@@ -5,7 +5,11 @@
   ***/
 var//RSence.Foundation
 HViewDefaults = HClass.extend({
-  
+
+/** Whether or not to draw when constructed.
+  */
+  autoDraw: true,
+
 /** The default label. A label is the "visual value" of a component that
   * operates on a "hidden" value.
   **/

data/client/js/lists/listitems/listitems.js

@@ -17,7 +17,7 @@
   ***/
 var//RSence.Lists
 HListItems = HValueResponder.extend({
-  
+
   constructor: function( _rect, _parent, _options ){
     if( _rect.hasAncestor && _rect.hasAncestor( HView ) ){
       _options = _parent;
@@ -43,7 +43,7 @@ HListItems = HValueResponder.extend({
       }
     }
   },
-  
+
   die: function() {
     var _this = this;
     if(_this.valueObj){
@@ -52,7 +52,7 @@ HListItems = HValueResponder.extend({
     }
     _this.value = null;
   },
-  
+
 /** = Description
   * Iterates through this.value array and calls
   * the setListItems function of the parent class.
@@ -82,7 +82,7 @@ HListItemControl = HControl.extend({
         i = 0;
     for ( ; i < _listItemsIn.length ; i++ ){
       _row = _listItemsIn[i];
-      _rowType = COMM.Values.type( _row );
+      _rowType = this.typeChr( _row );
       // console.log('row:',_row,' rowType:',_rowType);
       // hashes
       if ( _rowType === 'h' ) {
@@ -110,6 +110,28 @@ HListItemControl = HControl.extend({
     return _listItems;
   },
 
+  isValueInList: function(_value){
+    var i=0, _row, _rowType, _listItems = this.listItems;
+    if(!_listItems){
+      !this.isProduction && console.log("No listItems");
+      return false;
+    }
+    for( ; i<_listItems.length; i++ ){
+      _row = _listItems[i];
+      _rowType = this.typeChr( _row );
+      if( _rowType === 'h' ){
+        if( _row.value === _value ){ return true; }
+      }
+      else if( _rowType === 'a' ){
+        if( _row[0] === _value ){ return true; }
+      }
+      else if( ~['s','n'].indexOf(_rowType) ){
+        if( _row === _value ){ return true; }
+      }
+    }
+    return false;
+  },
+
   setListItems: function( _listItems ){
     _listItems = this._cleanListItems(_listItems);
   }

data/client/js/menus/combobox/combobox.coffee

@@ -0,0 +1,55 @@
+HComboBoxInterface =
+  refreshValue: ->
+    @base()
+    if @menu?
+      if @menu.isValueInList(@value)
+        @menu.setValue(@value)
+      else
+        @menu.setValue(@value)
+        @menu.valueMatrix.setValue(-1)
+  drawSubviews: ->
+    @base()
+    @stepper = null
+    @options.withStepper = false
+    _menuOptions = @options.menuOptions
+    _menuOptions.value = @value unless _menuOptions.value
+    _menuOptions.enabled = @enabled
+    _menuOptions.hidden = @isHidden
+    _menuOptions.listItems = [] unless _menuOptions.listItems
+    @menu = HPopupMenu.extend(
+      refreshValue: ->
+        @base()
+        @parent.setValue(@value) unless @parent.value == @value or @value == null
+      _firstRect: true
+      menuItemViewRect: ->
+        if @_firstRect
+          @_firstRect = false
+          return [ -1000, -1000, @parent.rect.width, (@listItems.length or 1)*24 ]
+        w = @parent.rect.width-2
+        [ x, y ] = [ @pageX(), @pageY() ]
+        x += -2 - w + @rect.width
+        if @options.menuBelow
+          y += @parent.rect.height
+        _rect = [ x, y, w, (@listItems.length or 1)*24 ]
+        _rect
+      repositionMenuItems: ->
+        @menuItemView.setRect( @menuItemViewRect() )
+        @menuItemView.drawRect()
+      drawSubviews: ->
+        @base()
+        @setMarkupOfPart('bg','▾')
+        @setStyleOfPart('bg',
+          lineHeight: (@rect.height+2)+'px'
+          verticalAlign: 'middle'
+          borderLeft: '1px solid #ccc'
+        )
+      @refreshValue()
+    ).new( [null,-1,14,@rect.height,0,null], @, _menuOptions )
+    @_extraLabelRight += 14
+    if @unitSuffix
+      ELEM.setStyle(@unitSuffix.elemId,'paddingRight','14px')
+      @unitSuffix.drawRect()
+    @setStyleOfPart('label','right',this._extraLabelRight+'px')
+    @menu.bringToFront()
+HComboBox = HTextControl.extend(HComboBoxInterface)
+HNumericComboBox = HNumericTextControl.extend(HComboBoxInterface)

data/client/js/menus/minimenu/minimenu.js

@@ -5,9 +5,9 @@
   ***/
 var//RSence.Menus
 HMiniMenu = HRadioButtonList.extend({
-  
+
   componentName: 'minimenu',
-  
+
   defaultEvents: {
     draggable: true,
     mouseUp: true,
@@ -15,12 +15,25 @@ HMiniMenu = HRadioButtonList.extend({
     resize: true
   },
 
+  markupElemNames: [ 'bg', 'control', 'label' ],
+
+  controlDefaults: HRadioButtonList.prototype.controlDefaults.extend({
+    itemStyle: {
+      'background-color': '#f6f6f6',
+      'border': '1px solid #999',
+      'overflow': 'auto',
+      'overflow-x': 'hidden',
+      'display': 'none',
+      'opacity': 1
+    }
+  }),
+
   subComponentHeight: 15,
 
   resize: function(){
     this.repositionMenuItems();
   },
-  
+
   repositionMenuItems: function(){
     var
     x = this.pageX(),
@@ -55,14 +68,15 @@ HMiniMenu = HRadioButtonList.extend({
 
   click: function(){
     if(!this.active){return false;}
-    if( ELEM.getStyle(this.menuItemView.elemId,'visibility',true) === 'hidden' ) {
+    if( !this._menuShown || this._menuShowTime+500 > this.msNow() ) {
       this.menuShow();
-    }else{
+    }
+    else{
       this.menuHide();
     }
     return false;
   },
-  
+
   refreshValue: function(){
     this.base();
     if(this.listItems && this.listItems.length !== 0 && this.valueMatrix !== undefined ) {
@@ -74,19 +88,42 @@ HMiniMenu = HRadioButtonList.extend({
       }
     }
   },
-  
+
+  _menuShowTime: 0,
+  _menuShown: false,
   menuShow: function(){
+    if(this._menuShown){
+      return false;
+    }
+    this._menuShown = true;
+    this._menuShowTime = this.msNow();
     this.repositionMenuItems();
     if( this._menuItemViewShowPos ){
       var m = this._menuItemViewShowPos, x=m[0], y=m[1];
       this.menuItemView.offsetTo( x, y );
     }
     this.menuItemView.bringToFront();
+    var _menu = this;
+    this.pushTask( function(){
+      _menu._hideElemId = ELEM.make( 0 );
+      ELEM.setStyles( _menu._hideElemId, {
+        position: 'absolute', left: 0, top: 0, right: 0, bottom: 0//, backgroundColor: '#000', opacity: 0.2
+      } );
+      Event.observe( ELEM.get( _menu._hideElemId ), 'mousedown', function(e){_menu.menuHide();EVENT.mouseDown(e);return false;} );
+      ELEM.setStyle( _menu._hideElemId, 'z-index', ELEM.getStyle(_menu.menuItemView.elemId,'z-index')-1 );
+    } );
     this.menuItemView.show();
     return true;
   },
-  
+
   menuHide: function(){
+    if( this._hideElemId ) {
+      ELEM.del( this._hideElemId );
+      this._hideElemId = null;
+      delete this._hideElemId;
+    }
+    this._menuShown = false;
+    this._menuShowTime = 0;
     if( this.menuItemView ){
       if( this._menuItemViewHidePos ){
         var m = this._menuItemViewHidePos, x=m[0], y=m[1];
@@ -96,21 +133,21 @@ HMiniMenu = HRadioButtonList.extend({
       this.menuItemView.hide();
     }
   },
-  
+
   startDrag: function(x,y){
-    this.dragStart = [x,y];
+    this.dragStart = [x,y,this.msNow()];
     if(!this.active){return false;}
     this.menuShow();
     return false;
   },
-  
+
   lostActiveStatus: function(_newActive){
     if( _newActive && !_newActive.isChildOf( this.menuItemView ) ){
       this.menuHide();
     }
     this.base(_newActive);
   },
-  
+
   gainedActiveStatus: function(_prevActive){
     if( _prevActive && _prevActive.isChildOf( this.menuItemView ) ){
       this.menuHide();
@@ -119,8 +156,8 @@ HMiniMenu = HRadioButtonList.extend({
   },
 
   endDrag: function(x,y){
-    if( (Math.round(this.dragStart[0]*0.2)===Math.round(x*0.2)) &&
-        (Math.round(this.dragStart[1]*0.2)===Math.round(y*0.2))
+    if(((Math.round(this.dragStart[0]*0.2)===Math.round(x*0.2)) &&
+        (Math.round(this.dragStart[1]*0.2)===Math.round(y*0.2)))
     ){
       this.menuShow();
     }
@@ -129,8 +166,13 @@ HMiniMenu = HRadioButtonList.extend({
     }
     return false;
   },
-  
+
   die: function(){
+    if( this._hideElemId ) {
+      ELEM.del( this._hideElemId );
+      this._hideElemId = null;
+      delete this._hideElemId;
+    }
     this.valueMatrix = null;
     var _menuItemView = this.menuItemView;
     this.base();
@@ -142,28 +184,17 @@ HMiniMenu = HRadioButtonList.extend({
     return [ 0-this.rect.width, 0-this.rect.height, this.rect.width, 10 ];
   },
   drawSubviews: function(){
-    var
-    itemStyle = {
-      'background-color': '#f6f6f6',
-      'border': '1px solid #999',
-      'overflow': 'auto',
-      'overflow-x': 'hidden',
-      'display': 'none'
-    };
-    if(!BROWSER_TYPE.ie){
-      itemStyle.opacity = 0.9;
-    }
     this.menuItemView = HView.nu(
       // [ this.rect.left, this.rect.top, this.rect.width, 10 ],
       this.menuItemViewRect(),
       this.app, {
         visible: false,
-        style: itemStyle,
+        style: this.options.itemStyle,
         logicParent: this
       }
     );
   },
-  
+
   setListItems: function(_listItems){
     this.base(_listItems);
     this.valueMatrix = this.menuItemView.valueMatrix;
@@ -173,7 +204,7 @@ HMiniMenu = HRadioButtonList.extend({
       this.menuShow();
     }
   },
-  
+
   createComponent: function( i, _label ){
     return HMiniMenuItem.nu(
       [ 0, (i*this.subComponentHeight), null, this.subComponentHeight, 0, null ],
@@ -182,5 +213,5 @@ HMiniMenu = HRadioButtonList.extend({
       }
     );
   }
-  
+
 });

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

@@ -3,8 +3,7 @@
 .minimenu_edge_left,
 .minimenu_center,
 .minimenu_edge_right,
-.minimenu_label,
-.minimenu_antiselect {
+.minimenu_label {
   position: absolute;
   top: 0px; height: 15px;
 }
@@ -57,7 +56,3 @@
 .disabled .minimenu_control {
   opacity: 0.8;
 }
-
-.minimenu_antiselect {
-  left: 0px; right: 0px;
-}

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

@@ -1,7 +1,8 @@
 <div class="minimenu_control" id="control]I[">
-  <div class="minimenu_edge_left"></div>
-  <div class="minimenu_center"></div>
-  <div class="minimenu_edge_right"></div>
+  <span id="bg]I[">
+    <div class="minimenu_edge_left"></div>
+    <div class="minimenu_center"></div>
+    <div class="minimenu_edge_right"></div>
+  </span>
   <div class="minimenu_label" id="label]I[">#{this.label}</div>
-  <div class="minimenu_antiselect"></div>
 </div>