rsence-pre 2.3.0.18 → 2.3.0.19

data/js/foundation/view/view.js

@@ -1230,8 +1230,8 @@ HView = UtilMethods.extend({
   *
   **/
   setStyleOfPart: function(_partName, _name, _value, _force) {
-    if (!this['markupElemIds']){
-      !this.isProduction && console.log('Warning, setStyleOfPart: no markupElemIds');
+    if (!this.markupElemIds){
+      !this.isProduction && console.log('Warning, setStyleOfPart('+_partName+','+_name+','+_value+') in a '+this.componentName+': no markupElemIds');
     }
     else if (this.markupElemIds[_partName]===undefined) {
       !this.isProduction && console.log('Warning, setStyleOfPart: partName "'+_partName+'" does not exist for viewId '+this.viewId+'.');
@@ -1255,8 +1255,8 @@ HView = UtilMethods.extend({
   *
   **/
   styleOfPart: function(_partName, _name, _force) {
-    if (!this['markupElemIds']){
-      !this.isProduction && console.log('Warning, styleOfPart: no markupElemIds');
+    if (!this.markupElemIds){
+      !this.isProduction && console.log('Warning, styleOfPart('+_partName+','+_name+') in a '+this.componentName+': no markupElemIds');
     }
     else if (this.markupElemIds[_partName]===undefined) {
       !this.isProduction && console.log('Warning, styleOfPart: partName "'+_partName+'" does not exist for viewId '+this.viewId+'.');
@@ -1278,8 +1278,8 @@ HView = UtilMethods.extend({
   *
   **/
   setMarkupOfPart: function( _partName, _value ) {
-    if (!this['markupElemIds']){
-      !this.isProduction && console.log('Warning, setMarkupOfPart: no markupElemIds');
+    if (!this.markupElemIds){
+      !this.isProduction && console.log('Warning, setMarkupOfPart('+_partName+') in a '+this.componentName+': no markupElemIds');
     }
     else if (this.markupElemIds[_partName]===undefined) {
       !this.isProduction && console.log('Warning, setMarkupOfPart: partName "'+_partName+'" does not exist for viewId '+this.viewId+'.');
@@ -1302,8 +1302,8 @@ HView = UtilMethods.extend({
   *
   **/
   markupOfPart: function(_partName) {
-    if (!this['markupElemIds']){
-      !this.isProduction && console.log('Warning, markupOfPart: no markupElemIds');
+    if (!this.markupElemIds){
+      !this.isProduction && console.log('Warning, markupOfPart('+_partName+') in a '+this.componentName+': no markupElemIds');
     }
     else if (this.markupElemIds[_partName]===undefined) {
       !this.isProduction && console.log('Warning, markupOfPart: partName "'+_partName+'" does not exist for viewId '+this.viewId+'.');

data/js/lists/propertylist/propertylist.js

@@ -33,7 +33,7 @@ HPropertyList = HControl.extend({
       clickY = y-this.contentView.pageY(),
       itemNum = Math.floor(clickY/this.options.rowHeight);
       if((clickY < 0) || (itemNum > this.valueTokens.length-1)){
-        this.editor.hide();
+        this.editor && this.editor.hide();
         return;
       }
       this.editItem( itemNum );
@@ -355,7 +355,7 @@ HPropertyList = HControl.extend({
   
   // Returns type of item
   itemType: function( item ){
-    return COMM.Values.type( item );
+    return this.typeChr( item );
   },
   
   // Translation from type code to type name
@@ -502,7 +502,7 @@ HPropertyList = HControl.extend({
     }
     
     this.selectedItem = itemNum;
-    this.editorValue.set( COMM.Values.clone(this.valueTokens[itemNum]) );
+    this.editorValue.set( this.cloneObject(this.valueTokens[itemNum]) );
     this.editor.show();
     EVENT.changeActiveControl(this.editor);
     this.editor.offsetTo( 0, targetY );
@@ -511,7 +511,7 @@ HPropertyList = HControl.extend({
   
   // Starts tokenizing, when the value is changed.
   refreshValue: function(){
-    if(this['propertyItems']===undefined){
+    if(this.propertyItems === undefined){
       return;
     }
     this.valueTokens = [];
@@ -531,7 +531,7 @@ HPropertyList = HControl.extend({
     }
     
     var i, token;
-    if(this['propertyItems'] === undefined){
+    if(this.propertyItems === undefined){
       this.propertyItems = [];
     }
     var colHeight = 0, colId = 0;

data/js/lists/radiobuttonlist/radiobuttonlist.js

@@ -155,7 +155,7 @@ HRadioButtonList = HListItemControl.extend({
   
   refreshValue: function(){
     var _value = this.value;
-    if ( this.listItems && this.listItems.length !== 0 && this['valueMatrix'] !== undefined ) {
+    if ( this.listItems && this.listItems.length !== 0 && this.valueMatrix !== undefined ) {
       if ( this.radioButtonResponder === false ){
         this.radioButtonIndexValue = HValue.nu( false, 0 );
         this.radioButtonIndexValue.bind( this.valueMatrix );

data/js/menus/minimenu/minimenu.js

@@ -39,7 +39,7 @@ HMiniMenu = HRadioButtonList.extend({
     if(y < 0){
       y = this.subComponentHeight%y;
     }
-    if(this.options['menuItemGeom']){
+    if(this.options.menuItemGeom){
       if(this.options.menuItemGeom.width){
         w += this.options.menuItemGeom.width;
       }
@@ -59,7 +59,7 @@ HMiniMenu = HRadioButtonList.extend({
   
   refreshValue: function(){
     this.base();
-    if(this.listItems && this.listItems.length !== 0 && this['valueMatrix'] !== undefined ) {
+    if(this.listItems && this.listItems.length !== 0 && this.valueMatrix !== undefined ) {
       for(var i=0;i<this.listItems.length;i++){
         if(this.listItems[i][0]===this.value){
           this.setLabel( this.listItems[i][1] );

data/js/tables/table/table.coffee

@@ -1,16 +1,24 @@
 HTable = HControl.extend
   componentName: 'table'
-  markupElemNames: [ 'header', 'subview' ]
+  markupElemNames: [ 'header', 'subview', 'grid' ]
   defaultEvents:
     resize: true
   controlDefaults: HControlDefaults.extend
-    tableType: 'rows'
-    constructor: (_opt)->
-      @headerCols = false unless @headerCols?
-      @sortDescending = [] unless @sortDescending?
-      @colWidths = [] unless @colWidths?
-      @colOptions = {} unless @colOptions?
-    sortCol: 0
+    tableType: 'rows' # 'cols' not supported yet
+    constructor: (_view)->
+      @headerCols = false unless @headerCols? # array of strings 
+      @sortDescending = [] unless @sortDescending? # column sorting by index; true for descending; false for ascending
+      @colWidths = [] unless @colWidths? # widths by column index; default 'auto'
+      @colClasses = {} unless @colClasses? # class by column index
+      @defaultColOptions = {} unless @defaultColOptions? # fallback default column options
+      @colOptions = {} unless @colOptions? # column class constructor options by column index
+      @defaultColClass = HStringView unless @defaultColClass? # fallback default column class
+    sortCol: 0 # the default sort column
+    useCellGrid: false # whether to use colored cells or not
+    cellBgColor: '#eee' # the average bg color
+    cellBgColorDiff: '#080808' # color to add/subtract for even/odd col/row
+    cellBorderWidth: 1 # cell border width in pixels
+    cellBorderColor: '#fff' # cell border color
   _destroyHeader: ->
     if @headerCols?
       _table = @
@@ -36,6 +44,65 @@ HTable = HControl.extend
     #     _colView.rect.setLeft(_size[0])
     #     _colView.rect.setWidth(_size[1])
     #     _colView.drawRect()
+  _initCellBgColors: ->
+    _color1 = @options.cellBgColor
+    _colorDiff = @options.cellBgColorDiff
+    if _color1 == 'transparent'
+      @_cellBgColors = [ 'transparent', 'transparent', 'transparent' ]
+      return
+    else if not _colorDiff
+      @_cellBgColors = [ _color1, _color1, _color1 ]
+      return
+    _color0 = @hexColorSubtract( _color1, _colorDiff )
+    _color2 = @hexColorAdd( _color1, _colorDiff )
+    @_cellBgColors = [ _color0, _color1, _color2 ]
+  _cellBgColorOf: (_row, _col)->
+    _colorIndex = (_row%2) + (1-_col%2)
+    @_cellBgColors[_colorIndex]
+  _drawCellStyles: ->
+    if @_bgCells?
+      for _bgCellId in @_bgCells
+        ELEM.del( _bgCellId )
+      delete @_bgCells
+    return unless @colViews?
+    # the border width offset calculations are fubar; refactor when time available
+    @_bgCells = []
+    _parent = @markupElemIds.grid
+    _leftOffset = @headerSizes[0][0]
+    @_initCellBgColors()
+    _borderSize = @options.cellBorderWidth
+    _borderColor = @options.cellBorderColor
+    _borderStyle = _borderSize+'px solid '+_borderColor
+    _heightOffset = _borderSize
+    _height = 24-_heightOffset
+    _topAdd = 24
+    _halfBorderWidth = Math.floor(_borderSize*0.5)
+    _widthOffset = 6-_borderSize-_halfBorderWidth
+    _borderLeftOffset = 0-_halfBorderWidth
+    for _colView, _colNum in @colViews
+      [ _left, _width ] = @headerSizes[_colNum]
+      if _colNum == 0
+        _left = _borderLeftOffset
+        _width += _leftOffset+_borderLeftOffset
+        _width -= _halfBorderWidth if _borderSize % 2 == 1
+      else
+        _left += _borderLeftOffset-_widthOffset
+        _left -= _borderSize if _borderSize > 1
+        _width += _widthOffset
+        _width += _halfBorderWidth
+      _top = _borderLeftOffset
+      for _row, _rowNum in @_rows
+        @_bgCells << ELEM.make(
+          _parent, 'div',
+          styles:
+            backgroundColor: @_cellBgColorOf(_rowNum,_colNum)
+            border: _borderStyle
+            top: _top+'px'
+            left: _left+'px'
+            width: _width+'px'
+            height: _height+'px'
+        )
+        _top += _topAdd
   drawHeader: ->
     _elemIds = []
     _sizes = []
@@ -104,6 +171,7 @@ HTable = HControl.extend
       @colViews[_colNum].rect.offsetTo( _left, 0 )
       @colViews[_colNum].rect.setWidth( _width )
       @colViews[_colNum].drawRect()
+    @_drawCellStyles()
   drawSubviews: ->
     if @options.headerCols
       @drawHeader()
@@ -120,16 +188,15 @@ HTable = HControl.extend
     if @options.colOptions[_colNum]?
       _colOption = @options.colOptions[_colNum]
     else
-      _colOption = {}
+      _colOption = @cloneObject( @options.defaultColOptions )
     if @options.colClasses[_colNum]?
       _colClass = @options.colClasses[_colNum]
       if typeof _colClass == 'function' and _colClass.hasAncestor? and _colClass.hasAncestor( HControl )
         return [ _colClass, _colOption ]
       else if _colClass instanceof Object and not _colClass.hasAncestor?
         for _className of _colClass
-          if typeof _className == 'string'
-            return [ @_findClassInNameSpace( _className ), _colClass[_className] ]
-      else if typeof _colClass == 'string'
+          return [ @_findClassInNameSpace( _className ), _colClass[_className] ] if @typeChr(_className) == 's'
+      else if @typeChr(_colClass) == 's'
         return [ @_findClassInNameSpace( _colClass ), _colOption ]
     return [ @_findClassInNameSpace( @options.defaultColClass ), _colOption ]
   _destroyRows: ->
@@ -150,9 +217,9 @@ HTable = HControl.extend
     for _row, i in @_rows
       _rowSort.push( [ @value[i], _row ] )
     _nextCols = []
-    if @options.sortOrder[_col]?
-      if @options.sortOrder[_col] instanceof Array
-        _nextCols = HVM.clone( @options.sortOrder[_col] )
+    if @options.sortOrder? and @options.sortOrder[_col]?
+      if @typeChr( @options.sortOrder[_col] ) == 'a'
+        _nextCols = @cloneObject( @options.sortOrder[_col] )
       else
         _nextCols = [ @options.sortOrder[_col] ]
     else
@@ -182,7 +249,7 @@ HTable = HControl.extend
           _col.hide()
       else
         _rowsVisible += 1
-        for _col in _row
+        for _col, _colNum in _row
           _col.show()
           _col.rect.offsetTo( 0, _top )
           _col.drawRect()
@@ -206,7 +273,8 @@ HTable = HControl.extend
     else if @_rowsDrawn and _newData and @_rows.length == @value.length
       for _row, _rowNum in @value
         for _col, _colNum in _row
-          @_rows[_rowNum][_colNum].setValue( _col )
+          _ctrl = @_rows[_rowNum][_colNum]
+          _ctrl.setValue( _col )
       @sortTableRows()
     else
       if @_rowsDrawn
@@ -219,11 +287,12 @@ HTable = HControl.extend
           _colOpts.value = _col
           _colOpts.tableRow = _rowNum
           _colOpts.tableCol = _colNum
-          _rows[_rowNum][_colNum] = _colClass.new(
+          _ctrl = _colClass.new(
             [ 0, _top, null, _rowHeight, 0, null ],
             @colViews[_colNum],
             _colOpts
           )
+          _rows[_rowNum][_colNum] = _ctrl
         _top += _rowHeight
       for _colView in _colViews
         _colView.rect.setHeight(_top)
@@ -237,7 +306,9 @@ HTable = HControl.extend
     if @options.tableType == 'rows'
       @refreshTableRows(_newData)
     else if @options.tableType == 'cols'
+      console.log('ERROR; refreshTable: tableType \'cols\' not supported!')
       @refreshTableCols(_newData)
+    @_drawCellStyles() if @options.useCellGrid and _newData
   refreshValue: ->
     if @value instanceof Array
       @refreshTable( true )

data/js/tables/table/themes/default/table.css

@@ -23,3 +23,9 @@
   position: absolute; top: 24px; left: 0; right: 0; bottom: 0;
   overflow: auto; overflow-x: hidden;
 }
+.default > .table_body > .table_grid {
+  position: absolute; top: 0; left: 0; overflow: visible;
+}
+.default > .table_body > .table_grid > div {
+  position: absolute; height: 24px;
+}

data/js/tables/table/themes/default/table.html

@@ -1,2 +1,4 @@
 <div id="header#{_ID}" class="table_header"></div>
-<div id="subview#{_ID}" class="table_body"></div>
+<div id="subview#{_ID}" class="table_body">
+<div id="grid#{_ID}" class="table_grid"></div>
+</div>

data/lib/rsence/valuemanager.rb

@@ -141,7 +141,12 @@ module RSence
       # loop through un-validated values and validate them
       check_ids = session_values[:check]
       check_ids.clone.each do |check_id|
-        session_values[:by_id][check_id].tell( msg )
+        value = session_values[:by_id][check_id]
+        if value.nil?
+          warn "ses_id: #{msg.ses_id} nil value of value_id: #{check_id.inspect}"
+        else
+          value.tell( msg )
+        end
       end
     
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsence-pre
 version: !ruby/object:Gem::Version
-  version: 2.3.0.18
+  version: 2.3.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsence-deps