rsence-pre 2.3.0.2 → 2.3.0.3

data/VERSION

@@ -1 +1 @@
-2.3.0.2.pre
+2.3.0.3.pre

data/js/foundation/control/eventresponder/eventresponder.js

@@ -774,18 +774,18 @@ HEventResponder = HClass.extend({
   **/
   selected: false,
   select: function(){
-    this.selected = true;
-    console.warn("HControl#select not supported yet.");
+    // console.warn("HControl#select not supported yet.");
   },
   deSelect: function(){
-    this.selected = false;
-    console.warn("HControl#deSelect not supported yet.");
+    // console.warn("HControl#deSelect not supported yet.");
   },
   setSelected: function(_state){
     if( _state ){
+      this.selected = true;
       this.select();
     }
     else {
+      this.selected = false;
       this.deSelect();
     }
   }  

data/js/foundation/locale_settings/locale_settings.js

@@ -10,6 +10,73 @@ var
 HLocale = {
   components: {
     
+  },
+  compUnits: {
+    strings: {
+      bit: ' b',
+      'byte': ' B',
+      kilobyte: ' kB',
+      kibibyte: ' KiB',
+      megabyte: ' MB',
+      mebibyte: ' MiB',
+      gigabyte: ' GB',
+      gibibyte: ' GiB',
+      terabyte: ' TB',
+      tebibyte: ' TiB',
+      petabyte: ' PB',
+      pebibyte: ' PiB'//,
+      // exabyte: ' EB',
+      // ebibyte: ' EiB',
+      // zettabyte: ' ZB',
+      // zebibyte: ' ZiB',
+      // yottabyte: ' YB',
+      // yobibyte: ' YiB'
+    },
+    units: {
+      SI: [
+        [ 1000, 'byte' ],
+        [ 1000000, 'kilobyte' ],
+        [ 1000000000, 'megabyte' ],
+        [ 1000000000000, 'gigabyte' ],
+        [ 1000000000000000, 'terabyte' ],
+        [ 1000000000000000000, 'petabyte' ]
+      ],
+      IEC: [
+        [ 1024, 'byte' ],
+        [ 1048576, 'kibibyte' ],
+        [ 1073741824, 'mebibyte' ],
+        [ 1099511627776, 'gibibyte' ],
+        [ 1125899906842624, 'tebibyte' ],
+        [ 1152921504606846976, 'pebibyte' ]
+      ]
+    },
+    defaultUnitSystem: 'SI',
+    formatBytes: function( _value, _decimals, _unitSystem ){
+      var _this = HLocale.compUnits;
+      if(!_decimals){ _decimals = 0; }
+      if(!_unitSystem){ _unitSystem = _this.defaultUnitSystem; }
+      var
+      _strings = _this.strings,
+      _decMul = Math.pow(10,_decimals),
+      _conv = _this.units[_unitSystem],
+      i = 0,
+      _lim, _div=1, _num, _suffix;
+      for( ; i < _conv.length; i++ ){
+        _lim = _conv[i][0];
+        _suffix = _strings[_conv[i][1]];
+        if( _value < _lim ){
+          break;
+        }
+        _div = _lim;
+      }
+      if( i && _decimals ){
+        _num = Math.round((_value*_decMul)/_div)/_decMul;
+      }
+      else {
+        _num = Math.round(_value/_div);
+      }
+      return _num+_suffix;
+    }
   },
   dateTime: {
     strings: {

data/js/tables/table/table.coffee

@@ -1,19 +1,237 @@
-HTable = HControl.extend({
+HTable = HControl.extend
   componentName: 'table'
-  markupElemNames: ['bg','header','content','header-columns']
-  _resetElements: ->
-    if @_tableElements
-      ELEM.del( _id ) for _id in @_tableElements
-    @_tableElements = []
-    @_rowElements = []
-    @_colElements = []
-  _createTableRow: ( _row, i )->
-    console.log( 'row:', _row, ', i:',i )
-
-  _refreshTableContents: ->
-    _value = @value
-    @_createTableRow( _row, i ) for _row, i in _value 
+  markupElemNames: [ 'header', 'subview' ]
+  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
+  _destroyHeader: ->
+    if @headerCols?
+      _table = @
+      for _elemId, i in @headerCols
+        Event.stopObserving(ELEM.get(_elemId),'click',@sortFns[i])
+        ELEM.del(_elemId)
+      delete @headerCols
+      delete @headerSizes
+      delete @sortFns
+  sortByCol: (_col)->
+    if @options.sortCol == _col
+      if @options.sortDescending[_col]?
+        @options.sortDescending[_col] = !@options.sortDescending[_col]
+      else
+        @options.sortDescending[_col] = false
+    else
+      @options.sortCol = _col
+    @drawHeader()
+    @refreshTable()
+    # if @colViews?
+    #   for _size, i in @headerSizes
+    #     _colView = @colViews[i]
+    #     _colView.rect.setLeft(_size[0])
+    #     _colView.rect.setWidth(_size[1])
+    #     _colView.drawRect()
+  drawHeader: ->
+    _elemIds = []
+    _sizes = []
+    _autoWidths = []
+    _sortFns = []
+    _left = 6
+    _table = @
+    for _headerCol, i in @options.headerCols
+      _left += 6
+      _elemId = ELEM.make( @markupElemIds.header, 'div' )
+      @options.sortDescending[i] = false unless @options.sortDescending[i]?
+      ELEM.addClassName(_elemId,'table_header_column')
+      ELEM.flush()
+      if @options.sortCol == i
+        _headerCol += '<div class="sort">'
+        if @options.sortDescending[i]
+          _headerCol += '&#9660;'
+        else
+          _headerCol += '&#9650;'
+        _headerCol += '</div>'
+        _width = -6 #26
+      else
+        _width = -6 #26
+        # ELEM.setStyle(_elemId,'font-weight','normal',true)
+      if @options.colWidths[i]?
+        if @options.colWidths[i] == 'auto'
+          _autoWidths.push(i)
+        else
+          _width += @options.colWidths[i]
+      else
+        _width += @stringWidth(_headerCol, null, _elemId)
+      _sizes.push([_left,_width])
+      ELEM.setAttr(_elemId,'sortcol',i)
+      ELEM.setHTML(_elemId,_headerCol)
+      _sortFns.push((e)->
+        _table.sortByCol(@sortcol)
+        e.preventDefault()
+        true
+      )
+      Event.observe(ELEM.get(_elemId),'click',_sortFns[i])
+      _left += _width
+      _elemIds.push( _elemId )
+    if _autoWidths.length > 0
+      _autoWidth = Math.floor(( @rect.width - _left )/_autoWidths.length)
+    _plusLeft = 0
+    for [_left, _width], i in _sizes
+      _elemId = _elemIds[i]
+      ELEM.setStyle(_elemId,'left',_left+_plusLeft+'px')
+      _sizes[i][0] = _left+_plusLeft
+      if _autoWidths.indexOf(i) != -1
+        _width = _autoWidth - 6
+        # _width += 20 if i == @options.sortCol
+        _sizes[i][1] = _width
+        _plusLeft += _autoWidth
+      ELEM.setStyle(_elemId,'width',_width+'px')
+    @_destroyHeader()
+    ELEM.flush()
+    @headerCols = _elemIds
+    @headerSizes = _sizes
+    @sortFns = _sortFns
+  resize: ->
+    @drawHeader()
+    for _colNum in [0..@headerCols.length-1]
+      _left = @headerSizes[_colNum][0]
+      _width = @headerSizes[_colNum][1]
+      @colViews[_colNum].rect.offsetTo( _left, 0 )
+      @colViews[_colNum].rect.setWidth( _width )
+      @colViews[_colNum].drawRect()
+  drawSubviews: ->
+    if @options.headerCols
+      @drawHeader()
+    else
+      @setStyleOfPart('body','top',0)
+  _findClassInNameSpace: (_className)->
+    if typeof _className == 'function' and _className.hasAncestor? and _className.hasAncestor( HControl )
+      return _className
+    else if typeof _className == 'string' and window[_className]?
+      return window[_className] # should have more elegant lookup
+    console.warn( 'HTable#'+'_'+'findClassNameInNamespace: No such className => ', _className, ', using default => ',@options.defaultColClass )
+    return @options.defaultColClass
+  _getClassNameAndValueOfCol: (_col, _colNum)->
+    if @options.colOptions[_colNum]?
+      _colOption = @options.colOptions[_colNum]
+    else
+      _colOption = {}
+    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( _colClass ), _colOption ]
+    return [ @_findClassInNameSpace( @options.defaultColClass ), _colOption ]
+  _destroyRows: ->
+    for _row, _rowNum in @_rows
+      for _col, _colNum in _row
+        _col.die()
+        _row[_colNum]
+    @_rows = []
+    @_rowsDrawn = false
+  filterRow: (_value)->
+    return false
+  sortTableRows: ->
+    _rowsVisible = 0
+    _col = @options.sortCol
+    _sortDescending = @options.sortDescending
+    _desc = _sortDescending[_col]
+    _rowSort = []
+    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] )
+      else
+        _nextCols = [ @options.sortOrder[_col] ]
+    else
+      _nextCols = []
+    _rowSorter = (_row1, _row2, _col, _nextCols, _desc)->
+      _r1 = _row1[0][_col]
+      _r2 = _row2[0][_col]
+      while _r1 == _r2 and _nextCols.length > 0
+        _nextCol = _nextCols.shift()
+        _desc = _sortDescending[_nextCol]
+        _r1 = _row1[0][_nextCol]
+        _r2 = _row2[0][_nextCol]
+      return 0 if _r1 == _r2
+      if _desc
+        return 1 if _r1 < _r2
+      else
+        return 1 if _r1 > _r2
+      return -1
+    _rowSort.sort( (_row1,_row2)->
+      _rowSorter(_row1, _row2, _col, HVM.clone(_nextCols), _desc)
+    )
+    _top = 0
+    _rowHeight = 24
+    for [ _value, _row ], _rowNum in _rowSort
+      if @filterRow(_value)
+        for _col in _row
+          _col.hide()
+      else
+        _rowsVisible += 1
+        for _col in _row
+          _col.show()
+          _col.rect.offsetTo( 0, _top )
+          _col.drawRect()
+        _top += _rowHeight
+    @_rowsVisible = _rowsVisible
+  refreshTableRows: (_newData)->
+    return unless @headerCols?
+    _top = 0
+    _rowHeight = 24
+    if @colViews?
+      _colViews = @colViews
+    else
+      _colViews = []
+      for _colNum in [0..@headerCols.length-1]
+        _left = @headerSizes[_colNum][0]
+        _width = @headerSizes[_colNum][1]
+        _colViews[_colNum] = HView.nu( [ _left, 0, _width, 1 ], @ )
+      @colViews = _colViews
+    if @_rowsDrawn and not _newData
+      @sortTableRows()
+    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 )
+      @sortTableRows()
+    else
+      if @_rowsDrawn
+        @_destroyRows()
+      _rows = []
+      for _row, _rowNum in @value
+        _rows[_rowNum] = []
+        for _col, _colNum in _row
+          [ _colClass, _colOpts ] = @_getClassNameAndValueOfCol(_col, _colNum)
+          _colOpts.value = _col
+          _rows[_rowNum][_colNum] = _colClass.nu( [0,_top,null,_rowHeight,0,null], @colViews[_colNum], _colOpts )
+        _top += _rowHeight
+      for _colView in _colViews
+        _colView.rect.setHeight(_top)
+        _colView.drawRect()
+      @_rows = _rows
+      @_rowsDrawn = true
+      @sortTableRows()
+  refreshTableCols: (_newData)->
+    console.warn('HTable#refreshTableCols is not implemented yet!')
+  refreshTable: (_newData)->
+    if @options.tableType == 'rows'
+      @refreshTableRows(_newData)
+    else if @options.tableType == 'cols'
+      @refreshTableCols(_newData)
   refreshValue: ->
-    @_refreshTableContents() if @drawn and ( @value.constructor == Array )
-})
-
+    if @value instanceof Array
+      @refreshTable( true )

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

@@ -0,0 +1,25 @@
+.default > .table_header {
+  position:absolute;
+  left: 0; top: 0; right: 0; height: 22px;
+  border: 1px solid #333;
+  background: #eee;
+  font-family: Helvetica, Arial, sans-serif;
+  font-size: 13px; line-height: 20px;
+  vertical-align: middle;
+  color: #000;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -khtml-user-select: none;
+}
+.default > .table_header > .table_header_column {
+  top: 1px; height: 20px; position: absolute;
+  cursor: pointer; border-right: 1px solid #ccc;
+  font-weight: bold;
+}
+.default > .table_header > .table_header_column > .sort {
+  position: absolute; top: 1px; right: 2px;
+}
+.default > .table_body {
+  position: absolute; top: 24px; left: 0; right: 0; bottom: 0;
+  overflow: auto; overflow-x: hidden;
+}

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

@@ -1,19 +1,2 @@
-<div id="bg#{_ID}" class="table_bg">
-  <div class="table_nw"></div>
-  <div class="table_n"></div>
-  <div class="table_ne"></div>
-  <div class="table_w"></div>
-  <div class="table_c"></div>
-  <div class="table_e"></div>
-  <div class="table_sw"></div>
-  <div class="table_s"></div>
-  <div class="table_se"></div>
-</div>
-<div id="header#{_ID}" class="table_header">
-  <div class="table_header_left"></div>
-  <div class="table_header_middle"></div>
-  <div class="table_header_right"></div>
-  <div id="header_columns#{_ID}" class="table_columns"></div>
-</div>
-<div id="content#{_ID}" class="table_content"></div>
-</div>
+<div id="header#{_ID}" class="table_header"></div>
+<div id="subview#{_ID}" class="table_body"></div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsence-pre
 version: !ruby/object:Gem::Version
-  version: 2.3.0.2
+  version: 2.3.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsence-deps