rsence 2.2.2 → 2.2.3

data/VERSION

@@ -1 +1 @@
-2.2.2
+2.2.3

data/js/controls/sliders/slider/slider.js

@@ -289,7 +289,7 @@ HSlider = HControl.extend({
   
   prevOrientation: 'c',
   
-  cssClassPrefix: 'h',
+  orientations: ['n','s','c'],
   
 /** = Description
   * Changes the thumb graphic. Possible orientations by default are
@@ -316,17 +316,16 @@ HSlider = HControl.extend({
     }
     var _toggleCSS = this.toggleCSSClass,
         _ctrlId    = this.markupElemIds.control,
-        _orientations = ['n','s','w','e','c'],
+        _orientations = this.orientations,
         _iOrientation = '',
         _cssClassName = '',
-        _cssClassPrefix = this.cssClassPrefix,
-        _cssClassVert = this._isVertical?'v':'',
+        _componentName = this.componentName,
         _activeOrientation = false,
         i = 0;
-    for(;i<5;i++){
+    for(;i<3;i++){
       _iOrientation = _orientations[i];
       _activeOrientation = (_orientation===_iOrientation);
-      _cssClassName = (_orientation==='c')?_cssClassPrefix+_cssClassVert+'slider_thumb':_cssClassPrefix+'slider_thumb_'+_iOrientation;
+      _cssClassName = (_orientation==='c')?_componentName+'_thumb':_componentName+'_thumb_'+_iOrientation;
       _toggleCSS( _ctrlId, _cssClassName, _activeOrientation );
     }
     

data/js/controls/sliders/slider/themes/default/slider.css

@@ -1,108 +1,80 @@
-.hslider_track_left,
-.hslider_track_right,
-.hslider_track {
+.slider_track_left,
+.slider_track_right,
+.slider_track {
   position: absolute;
   height: 7px; top: 7px;
-  font-size: 0px;
+  font-size: 0;
   background-image: #{this.getCssFilePath('hslider_tracks.png')};
 }
 
-.hslider_track_left {
+.slider_track_left {
   left: 10px; width: 4px;
-  background-position: 0px 0px;
+  background-position: 0 0;
 }
 
-.hslider_track_right {
+.slider_track_right {
   right: 10px; width: 4px;
-  background-position: -4px 0px;
+  background-position: -4px 0;
 }
 
-.hslider_track {
+.slider_track {
   left: 14px; right: 14px;
-  background-position: 0px -14px;
+  background-position: 0 -14px;
 }
 
-.disabled .hslider_track_left {
-  background-position: 0px -7px;
+.disabled .slider_track_left {
+  background-position: 0 -7px;
 }
 
-.disabled .hslider_track_right {
+.disabled .slider_track_right {
   background-position: -4px -7px;
 }
 
-.disabled .hslider_track {
-  background-position: 0px -21px;
+.disabled .slider_track {
+  background-position: 0 -21px;
 }
 
-.hslider_thumb {
+.slider_thumb {
   position: absolute;
-  top: 0px; height: 21px; width: 21px;
-  font-size: 0px;
-  background-position: 0px 0px;
+  top: 0; height: 21px; width: 21px;
+  font-size: 0;
+  background-position: 0 0;
   background-image: #{this.getCssFilePath('slider_thumbs.png')};
 }
 
-.hslider_thumb:active {
-  background-position: 0px -22px;
+.slider_thumb:active {
+  background-position: 0 -22px;
 }
 
-.disabled .hslider_thumb {
-  background-position: 0px -44px;
+.disabled .slider_thumb {
+  background-position: 0 -44px;
 }
 
-.hslider_thumb_n,
-.hslider_thumb_s,
-.hslider_thumb_e,
-.hslider_thumb_w {
+.slider_thumb_n,
+.slider_thumb_s {
   position: absolute;
-  top: 0px; height: 21px; width: 21px;
+  top: 0; height: 21px; width: 21px;
   background-image: #{this.getCssFilePath('slider_thumbs.png')};
 }
 
-.hslider_thumb_e,
-.hslider_thumb_w {
-  left: 0px;
+.slider_thumb_n {
+ background-position: -22px 0;
 }
-
-.hslider_thumb_n {
- background-position: -22px 0px;
-}
-.hslider_thumb_n:active {
+.slider_thumb_n:active {
  background-position: -22px -22px;
 }
-.disabled .hslider_thumb_n {
+.disabled .slider_thumb_n {
  background-position: -22px -44px;
 }
 
-.hslider_thumb_s {
- background-position: -44px 0px;
+.slider_thumb_s {
+ background-position: -44px 0;
 }
-.hslider_thumb_s:active {
+.slider_thumb_s:active {
  background-position: -44px -22px;
 }
-.disabled .hslider_thumb_s {
+.disabled .slider_thumb_s {
  background-position: -44px -44px;
 }
 
-.hslider_thumb_w {
- background-position: -66px 0px;
-}
-.hslider_thumb_w:active {
- background-position: -66px -22px;
-}
-.disabled .hslider_thumb_w {
- background-position: -66px -44px;
-}
-
-.hslider_thumb_e {
- background-position: -88px 0px;
-}
-.hslider_thumb_e:active {
- background-position: -88px -22px;
-}
-.disabled .hslider_thumb_e {
- background-position: -88px -44px;
-}
-
-
 

data/js/controls/sliders/slider/themes/default/slider.html

@@ -1,5 +1,5 @@
-<div class="hslider_track_left"></div>
-<div class="hslider_track_right"></div>
-<div class="hslider_track"></div>
-<div class="hslider_thumb" id="control#{_ID}"></div>
+<div class="slider_track_left"></div>
+<div class="slider_track_right"></div>
+<div class="slider_track"></div>
+<div class="slider_thumb" id="control#{_ID}"></div>
 ${this.thumbSize=21;}

data/js/controls/sliders/vslider/themes/default/vslider.css

@@ -3,27 +3,27 @@
 .vslider_track {
   position: absolute;
   width: 7px; left: 7px;
-  font-size: 0px;
+  font-size: 0;
   background-image: #{this.getCssFilePath('vslider_tracks.png')};
 }
 
 .vslider_track_top {
   top: 10px; height: 4px;
-  background-position: 0px 0px;
+  background-position: 0 0;
 }
 
 .vslider_track_bottom {
   bottom: 10px; height: 4px;
-  background-position: 0px -4px;
+  background-position: 0 -4px;
 }
 
 .vslider_track {
   top: 14px; bottom: 14px;
-  background-position: -14px 0px;
+  background-position: -14px 0;
 }
 
 .disabled .vslider_track_top {
-  background-position: -7px 0px;
+  background-position: -7px 0;
 }
 
 .disabled .vslider_track_bottom {
@@ -31,22 +31,55 @@
 }
 
 .disabled .vslider_track {
-  background-position: -21px 0px;
+  background-position: -21px 0;
 }
 
 .vslider_thumb {
   position: absolute;
   font-size: 0px;
-  left: 0px; width: 21px; height: 21px;
-  background-position: 0px 0px;
+  left: 0; width: 21px; height: 21px;
+  background-position: 0 0;
   background-image: #{this.getCssFilePath('slider_thumbs.png')};
 }
 
 .vslider_thumb:active {
-  background-position: 0px -22px;
+  background-position: 0 -22px;
 }
 
 .disabled .vslider_thumb {
-  background-position: 0px -44px;
+  background-position: 0 -44px;
+}
+
+.vslider_thumb_e,
+.vslider_thumb_w {
+  position: absolute;
+  top: 0; height: 21px; width: 21px;
+  background-image: #{this.getCssFilePath('slider_thumbs.png')};
+}
+
+.vslider_thumb_e,
+.vslider_thumb_w {
+  left: 0;
+}
+
+.vslider_thumb_w {
+ background-position: -66px 0;
+}
+.vslider_thumb_w:active {
+ background-position: -66px -22px;
+}
+.disabled .vslider_thumb_w {
+ background-position: -66px -44px;
+}
+
+.vslider_thumb_e {
+ background-position: -88px 0;
+}
+.vslider_thumb_e:active {
+ background-position: -88px -22px;
 }
+.disabled .vslider_thumb_e {
+ background-position: -88px -44px;
+}
+
 

data/js/controls/sliders/vslider/vslider.js

@@ -35,7 +35,9 @@ HVSlider = HSlider.extend({
   componentName: "vslider",
     
   // This overrides the HSlider property.
-  _isVertical: true
+  _isVertical: true,
+
+  orientations: ['w','e','c']
   
 });
 

data/js/controls/stepper/stepper.js

@@ -140,7 +140,7 @@ HStepper = HControl.extend({
     **/
   mouseDown: function( x, y ){
     this.setMouseUp(true);
-    this._setRepeatInterval(  ( y - ELEM.getVisiblePosition( this.elemId )[1] ) <= 11  );
+    this._setRepeatInterval(  ( y - this.pageY() ) <= 11  );
     return true;
   },
   

data/js/controls/stringview/stringview.js

@@ -43,14 +43,12 @@ var HStringView, HLabel;
     *
     **/
     refreshLabel: function() {
-      if(this.markupElemIds) {
-        if(this.markupElemIds.value) {
-          if( this.value !== undefined ){
-            this.setAttrOfPart( 'value', 'title', this.label );
-          }
-          else {
-            this.setMarkupOfPart( 'value', this.label );
-          }
+      if(this.markupElemIds && this.markupElemIds.value) {
+        if( this.value !== undefined ){
+          this.setAttrOfPart( 'value', 'title', this.label );
+        }
+        else {
+          this.setMarkupOfPart( 'value', this.label );
         }
       }
     }

data/js/controls/stringview/themes/default/stringview.html

@@ -1 +1 @@
-<div class="stringview" id="value#{_ID}" title="#{this.label}"></div>
+<div class="stringview" id="value#{_ID}"></div>

data/js/controls/textcontrol/textcontrol.js

@@ -152,23 +152,16 @@ HTextControl = HControl.extend({
   textBlur: function(){
     this.hasTextFocus = false;
     this._clearChangeEventFn();
-    this._updateValueFromField();
     if(this.options.refreshOnBlur){
+      this._updateValueFromField();
       this.refreshValue();
     }
     return true;
   },
   
   idle: function(){
-    if( !this.options.refreshOnIdle ){ return; }
-    this.hasTextFocus && this._updateValueFromField();
-    try{
-      this.base();
-    }
-    catch(e){
-      console.error('HTextControl::onIdle error -> ',e);
-      debugger;
-      this.base();
+    if( this.hasTextFocus && this.options.refreshOnIdle && this.options.refreshOnInput ){
+      this._updateValueFromField();
     }
   },
   
@@ -354,12 +347,12 @@ HTextControl = HControl.extend({
   *
   **/
   textEnter: function(){
-    this.setValue(
-      this.validateText(
-        this.getTextFieldValue()
-      )
-    );
     if(this.options.refreshOnInput){
+      this.setValue(
+        this.validateText(
+          this.getTextFieldValue()
+        )
+      );
       this.refreshValue();
     }
     return false;

data/js/datetime/calendar/calendar.coffee

@@ -20,7 +20,7 @@ HCalendar = HControl.extend
   ## the mouse wheel or equivalent content-scrolling user interface gesture
   defaultEvents:
     mouseWheel: true
-    # click: true
+    keyDown: true
   
   ## Calls HCalendar#nextMonth or HCalendar#prevMonth based on delta change
   ## of the mouseWheel event
@@ -29,10 +29,65 @@ HCalendar = HControl.extend
       @nextMonth()
     else
       @prevMonth()
+
+  ## Draws the next month
+  nextMonth: (_set)->
+    _dateNext = new Date( @viewMonth[0], @viewMonth[1]+1, 1 )
+    _dateMs = _dateNext.getTime() - @tzMs(_dateNext)
+    if _set
+      @setValue( _dateMs/1000 )
+    else
+      @drawCalendar( new Date(_dateMs) )
+  
+  ## Draws the prev month
+  prevMonth: (_set)->
+    _datePrev = new Date( @viewMonth[0], @viewMonth[1]-1, 1 )
+    _dateMs = _datePrev.getTime() - @tzMs(_datePrev)
+    if _set
+      @setValue( _dateMs/1000 )
+    else
+      @drawCalendar( new Date(_dateMs) )
   
-  ## Simple click-through for the themed hyperlinks
-  click: ->
-    false
+  ## Draws the next year
+  nextYear: (_set)->
+    _dateNext = new Date( @viewMonth[0]+1, @viewMonth[1], 1 )
+    _dateMs = _dateNext.getTime() - @tzMs(_dateNext)
+    if _set
+      @setValue( _dateMs/1000 )
+    else
+      @drawCalendar( new Date(_dateMs) )
+  
+  ## Draws the prev year
+  prevYear: (_set)->
+    _datePrev = new Date( @viewMonth[0]-1, @viewMonth[1], 1 )
+    _dateMs = _datePrev.getTime() - @tzMs(_datePrev)
+    if _set
+      @setValue( _dateMs/1000 )
+    else
+      @drawCalendar( new Date(_dateMs) )
+  
+  nextDay: -> @setValue( @value + 24*60*60 )
+  prevDay: -> @setValue( @value - 24*60*60 )
+  nextWeek: -> @setValue( @value + 7*24*60*60 )
+  prevWeek: -> @setValue( @value - 7*24*60*60 )
+
+  ## Keyboard control
+  keyDown: (_key)->
+    if EVENT.isShiftKeyDown()
+      @prevMonth(true) if _key == Event.KEY_LEFT
+      @nextMonth(true) if _key == Event.KEY_RIGHT
+      @prevYear(true) if _key == Event.KEY_UP
+      @nextYear(true) if _key == Event.KEY_DOWN
+    else
+      @nextDay() if _key == Event.KEY_RIGHT
+      @prevDay() if _key == Event.KEY_LEFT
+      @nextWeek() if _key == Event.KEY_DOWN
+      @prevWeek() if _key == Event.KEY_UP
+      @prevMonth(true) if _key == Event.KEY_PAGEUP
+      @nextMonth(true) if _key == Event.KEY_PAGEDOWN
+      @prevYear(true) if _key == Event.KEY_HOME
+      @nextYear(true) if _key == Event.KEY_END
+    true
   
   drawSubviews: ->
     _this = @
@@ -128,91 +183,83 @@ HCalendar = HControl.extend
       }
     }
 
+  lostActiveStatus: (_obj)->
+    if (_obj and @menu and !@menu._killed and !_obj.isChildOf(@menu) and !_obj.isChildOf(@menu.menuItemView))
+      @menu.die()
+    @base(_obj)
+
   ## Calls #drawCalendar when the value is changed
   refreshValue: ->
     @drawCalendar( @date() )
   
-  ## Draws the next month
-  nextMonth: ->
-    _dateNext = new Date( @viewMonth[0], @viewMonth[1]+1, 1 )
-    _dateMs = _dateNext.getTime() - @tzMs(_dateNext)
-    @drawCalendar( new Date(_dateMs) )
-  
-  ## Drows the prev month
-  prevMonth: ->
-    _datePrev = new Date( @viewMonth[0], @viewMonth[1]-1, 1 )
-    _dateMs = _datePrev.getTime() - @tzMs(_datePrev)
-    @drawCalendar( new Date(_dateMs) )
-  
   ## Stores the currently viewed year and month
   viewMonth: [ 1970, 0 ]
 
   ## Shows a pulldown menu for month selection
   monthMenu: ->
     return unless HMiniMenu?
-    _calendar = this
+    _calendar = @
     _monthValues = []
     for _monthName, i in HLocale.dateTime.strings.monthsLong
       _monthValues.push( [ i, _monthName ] )
     _rect = ELEM.getBoxCoords( @_monthMenu )
     _rect[0] += 20
     _rect[2] = 80 if _rect[2] < 80
-    HMiniMenu.extend(
-      _killAfterRefresh: false
+    @menu = HMiniMenu.extend(
+      click: ->
+        console.log('click')
       menuHide: ->
+        return if @_killed?
+        @_killed = true
         @base()
+        _calendar.setValue( _calendar.setMonth( @value ) )
+        if _calendar.month() != @value
+          _calendar.setValue( _calendar.setMday( 30 ) )
+          _calendar.setValue( _calendar.setMonth( @value ) )
+        if _calendar.month() != @value
+          _calendar.setValue( _calendar.setMday( 29 ) )
+          _calendar.setValue( _calendar.setMonth( @value ) )
+        if _calendar.month() != @value
+          _calendar.setValue( _calendar.setMday( 28 ) )
+          _calendar.setValue( _calendar.setMonth( @value ) )
         _menu = @
-        _menu._killAfterRefresh = true
         COMM.Queue.push( ->
-          if _menu._killAfterRefresh
-            _menu.refreshValue()
+          EVENT.changeActiveControl(_calendar)
+          _calendar.menu = null
+          _menu.die()
         )
-        return true;
-      refreshValue: ->
-        @base()
-        if @_killAfterRefresh
-          @_killAfterRefresh = false
-          _calendar.setValue( _calendar.setMonth( @value ) )
-          if _calendar.month() != @value
-            _calendar.setValue( _calendar.setMday( 30 ) )
-            _calendar.setValue( _calendar.setMonth( this.value ) )
-          if _calendar.month() != @value
-            _calendar.setValue( _calendar.setMday( 29 ) )
-            _calendar.setValue( _calendar.setMonth( @value ) )
-          if _calendar.month() != this.value
-            _calendar.setValue( _calendar.setMday( 28 ) )
-            _calendar.setValue( _calendar.setMonth( @value ) )
-          _menu = this
-          COMM.Queue.push( ->
-            _menu.die()
-          )
     ).new( _rect, @,
       value: @month()
       initialVisibility: true
-    ).setListItems( _monthValues )
+      listItems: _monthValues
+    )
   
   ## Shows a text field for year selection
   yearMenu: ->
     _calendar = @
+    _calendarEnable = @enabled
     _rect = ELEM.getBoxCoords( @_yearMenu )
     _rect[0] += 20
     _rect[2] = 40 if _rect[2] < 40
-    _rect[3] = 20
+    _rect[3] = 16
+    EVENT.changeActiveControl(null)
+    @setEnabled(false)
     HNumericTextControl.extend(
       refreshValue: ->
         @base()
         _calendar.setValue( _calendar.setYear( @value ) )
+      gainedActiveStatus: (_obj)->
+        @base(_obj)
+        _calendar.setEnabled(_calendarEnable)
       textBlur: ->
         @base()
-        _year = this
+        _year = @
         COMM.Queue.push( ->
-          _year.die() if _year.markupElemIds?
+          if _year.markupElemIds?
+            _year.die()
         )
-      textEnter: ->
-        @base()
-        _returnKeyPressed = EVENT.status[ EVENT.keysDown ].indexOf( 13 ) != -1
-        _noKeysPressed = EVENT.status[ EVENT.keysDown ].length == 0
-        if _returnKeyPressed or _noKeysPressed
+      keyDown: (_key)->
+        if _key == Event.KEY_RETURN
           ELEM.get( @markupElemIds.value ).blur()
     ).new( _rect, @,
       value: @year()
@@ -220,6 +267,11 @@ HCalendar = HControl.extend
       maxValue: 38400
       focusOnCreate: true
       refreshOnInput: false
+      refreshOnIdle: false
+      events:
+        keyDown: true
+      style:
+        fontSize: '11px'
     )
   
   _destroyCalendarElems: ->
@@ -238,7 +290,6 @@ HCalendar = HControl.extend
   ## Params:
   ## - _date: The date on which calendar UI is opened at.
   drawCalendar: (_date)->
-    @_destroyCalendarElems()
     _date = @date() unless ( _date instanceof Date )
     _calendarDateRange = @calendarDateRange( _date )
     _monthFirst = _calendarDateRange.month.firstDate
@@ -252,7 +303,7 @@ HCalendar = HControl.extend
     _colWidth = Math.floor( _availWidth / 8 )
     _rowHeight = Math.floor( _availHeight / 6 )
     _parentElem = @markupElemIds.value
-    ELEM.setStyle( _parentElem, 'visibility', 'hidden', true )
+    # ELEM.setStyle( _parentElem, 'visibility', 'hidden', true )
     _elems = []
     _this = @
     for _row in [0..5]
@@ -288,9 +339,10 @@ HCalendar = HControl.extend
           else
             ELEM.addClassName( _colElem, 'calendar_weeks_week_col_yes' )
           ELEM.setAttr( _colElem, '_colSecs', _colSecs )
-          Event.observe( ELEM.get( _colElem ), 'click', ->
-            _this.setValue( @_colSecs )
-          )
+          if @enabled
+            Event.observe( ELEM.get( _colElem ), 'click', ->
+              _this.setValue( @_colSecs )
+            )
           # ELEM.setAttr( _colElem, 'href', "javascript:HSystem.views[#{@viewId}].setValue(#{_colSecs})" )
           _left = (_col*_colWidth+_leftPlus)
           ELEM.setStyle( _colElem, 'left', _left+'px' )
@@ -298,13 +350,15 @@ HCalendar = HControl.extend
           ELEM.setStyle( _colElem, 'height', (_rowHeight-1)+'px' )
           ELEM.setStyle( _colElem, 'line-height', _rowHeight+'px' )
           ELEM.setHTML( _colElem, @mday( _colDate ) )
-    ELEM.setStyle( _parentElem, 'visibility', 'inherit' )
+    # ELEM.setStyle( _parentElem, 'visibility', 'inherit' )
+    ELEM.flush()
     _stateElem = @markupElemIds.state
 
     @_monthMenu = ELEM.make( _stateElem, 'span' )#, 'a' )
     _elems.push( @_monthMenu )
     # ELEM.setAttr( @_monthMenu, 'href', "javascript:HSystem.views[#{@viewId}].monthMenu()" )
-    Event.observe( ELEM.get( @_monthMenu ), 'click', ( -> _this.monthMenu() ), false )
+    if @enabled
+      Event.observe( ELEM.get( @_monthMenu ), 'click', ( -> _this.monthMenu() ), false )
     ELEM.setHTML( @_monthMenu, @monthName( _date ) )
 
     _spacer = ELEM.make( _stateElem, 'span' )
@@ -313,11 +367,13 @@ HCalendar = HControl.extend
 
     @_yearMenu = ELEM.make( _stateElem, 'span' )#, 'a' )
     _elems.push( @_yearMenu )
-    Event.observe( ELEM.get( @_yearMenu ), 'click', ( -> _this.yearMenu() ), false )
+    if @enabled
+      Event.observe( ELEM.get( @_yearMenu ), 'click', ( -> _this.yearMenu() ), false )
     # ELEM.setAttr( @_yearMenu, 'href', "javascript:HSystem.views[#{@viewId}].yearMenu()" )
     ELEM.setHTML( @_yearMenu, @year( _date ) )
 
     @viewMonth = [ _monthFirst.getUTCFullYear(), _monthFirst.getUTCMonth() ]
+    @_destroyCalendarElems()
     @_drawCalendarElems = _elems
 
 HCalendar.implement( HDateTime )

data/js/datetime/calendar/themes/default/calendar.css

@@ -95,10 +95,12 @@
   font-weight: bold;
   border: 1px solid #666;
 }
-.calendar_weeks_week_col_sel,
-.calendar_weeks_week_col_yes:hover {
+.calendar_weeks_week_col_sel {
   background-color: #fff;
 }
+.calendar_weeks_week_col_yes:hover {
+  border: 2px solid black; margin: -1px; z-index: 100; border-radius: 3px;
+}
 .calendar_bg {
   position: absolute;
   left: -1px; right: -1px;

data/js/foundation/control/dyncontrol/dyncontrol.js

@@ -441,6 +441,11 @@ HDynControl = HControl.extend({
       x-=_parent.pageX();
       y-=_parent.pageY();
     }
+    else {
+      var _scrollPos = ELEM.getScrollPosition(0);
+      x+=_scrollPos[0];
+      y+=_scrollPos[1];
+    }
     this._startPoint = new HPoint(x,y);
     this._startRect  = new HRect( this.rect );
     this._detectActionFlag();
@@ -473,6 +478,11 @@ HDynControl = HControl.extend({
       x-=_parent.pageX();
       y-=_parent.pageY();
     }
+    else {
+      var _scrollPos = ELEM.getScrollPosition(0);
+      x+=_scrollPos[0];
+      y+=_scrollPos[1];
+    }
     if(this._actionFlag!==-1){
       this._actionFns[this._actionFlag](this,x,y);
     }
@@ -503,6 +513,11 @@ HDynControl = HControl.extend({
       x-=_parent.pageX();
       y-=_parent.pageY();
     }
+    else {
+      var _scrollPos = ELEM.getScrollPosition(0);
+      x+=_scrollPos[0];
+      y+=_scrollPos[1];
+    }
     if(this._actionFlag!==-1){
       this._actionFns[this._actionFlag](this,x,y);
     }

data/js/foundation/eventmanager/eventmanager.js

@@ -431,8 +431,9 @@ EVENT = {
   **/
   mouseMove: function(e) {
     var _this = EVENT,
-        x = Event.pointerX(e),
-        y = Event.pointerY(e),
+        _scrollPos = ELEM.getScrollPosition(0),
+        x = Event.pointerX(e) - _scrollPos[0],
+        y = Event.pointerY(e) - _scrollPos[1],
         _currentlyDragging = _this.flushMouseMove(x, y);
     _this.status[_this.crsrX] = x;
     _this.status[_this.crsrY] = y;
@@ -988,7 +989,7 @@ EVENT = {
       }
     }
     // Insert key to the realtime array, remove in keyUp
-    if (_this.status[_this.keysDown].indexOf(_keyCode) === -1) {
+    if (_this.isKeyDown(_keyCode)) {
       _this.status[_this.keysDown].push(_keyCode);
     }
     if (!_this.status[_this.cmdKeyDown] && _stopEvent){
@@ -1037,12 +1038,36 @@ EVENT = {
       _this.status[_this.cmdKeyDown] = false;
     }
     // Remove the key from the realtime array, inserted in keyDown
-    _keyCodeIndex = _this.status[_this.keysDown].indexOf(_keyCode);
-    if (_keyCodeIndex !== -1) {
+    if(!_this.isKeyDown(_keyCode)){
+      _keyCodeIndex = _this.status[_this.keysDown].indexOf(_keyCode);
       _this.status[_this.keysDown].splice(_keyCodeIndex, 1);
     }
   },
 
+  isKeyDown: function(_keyCode){
+    return ( this.status[this.keysDown].indexOf(_keyCode) !== -1 );
+  },
+
+  isKeyUp: function(_keyCode){
+    return !this.isKeyDown(_keyCode);
+  },
+
+  isAltKeyDown: function(){
+    return this.status[this.altKeyDown];
+  },
+
+  isCtrlKeyDown: function(){
+    return this.status[this.ctrlKeyDown];
+  },
+
+  isShiftKeyDown: function(){
+    return this.status[this.shiftKeyDown];
+  },
+
+  isMetaKeyDown: function(){
+    return this.status[this.metaKeyDown];
+  },
+
   /* The keyPress itself is ignored per se and used only as a repetition event for the last keyDown. */
   keyPress: function(e) {
     var

data/js/foundation/view/view.js

@@ -1464,7 +1464,7 @@ HView = HClass.extend({
     if(!this.views && !this.isProduction){
       console.log('HView#die: no subviews for component name: ',this.componentName,', self:',this);
     }
-    while (this.views.length !== 0) {
+    while (this.views && this.views.length !== 0) {
       _childViewId = this.views[0];
       this.destroyView(_childViewId);
     }

data/js/lists/listitems/listitems.js

@@ -76,6 +76,13 @@ HListItems = HValueResponder.extend({
 var
 HListItemControl = HControl.extend({
 
+  constructor: function( _rect, _parent, _options ){
+    this.base( _rect, _parent, _options );
+    if( this.options.listItems && this.options.listItems instanceof Array ){
+      this.setListItems( this.options.listItems );
+    }
+  },
+
   _cleanListItems: function(_listItemsIn){
     var _listItems = [],
         _row, _rowType,

data/js/menus/minimenu/minimenu.js

@@ -29,6 +29,7 @@ HMiniMenu = HRadioButtonList.extend({
   },
   
   repositionMenuItems: function(){
+    if(!this.listItems || (this.listItems && !this.listItems.length)){ return; }
     var
     x = this.pageX(),
     y = this.pageY(),
@@ -95,18 +96,12 @@ HMiniMenu = HRadioButtonList.extend({
   },
   
   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){
     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))
@@ -154,7 +149,7 @@ HMiniMenu = HRadioButtonList.extend({
     this.valueMatrix = this.menuItemView.valueMatrix;
     this.refreshValue();
     if( this.options.initialVisibility ){
-      EVENT.changeActiveControl(this);
+      EVENT.changeActiveControl(null);
       this.menuShow();
     }
   },

data/lib/rsence/plugins/gui_plugin.rb

@@ -95,6 +95,7 @@ module RSence
           end
           sleep 0.1 until client_pkg.ready?
           client_pkg.add_packages(       @client_pkgs[:packages      ] ) if @client_pkgs.has_key?(:packages      )
+          client_pkg.add_compounds(      @client_pkgs[:compound_packages] ) if @client_pkgs.has_key?(:compound_packages)
           client_pkg.add_themes(         @client_pkgs[:theme_names   ] ) if @client_pkgs.has_key?(:theme_names   )
           client_pkg.add_gfx_formats(    @client_pkgs[:gfx_formats   ] ) if @client_pkgs.has_key?(:gfx_formats   )
           client_pkg.add_reserved_names( @client_pkgs[:reserved_names] ) if @client_pkgs.has_key?(:reserved_names)
@@ -117,6 +118,7 @@ module RSence
           client_pkg.del_reserved_names( @client_pkgs[:reserved_names] ) if @client_pkgs.has_key?(:reserved_names)
           client_pkg.del_gfx_formats(    @client_pkgs[:gfx_formats   ] ) if @client_pkgs.has_key?(:gfx_formats   )
           client_pkg.del_themes(         @client_pkgs[:theme_names   ] ) if @client_pkgs.has_key?(:theme_names   )
+          client_pkg.del_compounds(      @client_pkgs[:compound_packages] ) if @client_pkgs.has_key?(:compound_packages)
           client_pkg.del_packages(       @client_pkgs[:packages].keys  ) if @client_pkgs.has_key?(:packages      )
           client_pkg.rebuild_client
         end

data/plugins/client_pkg/client_pkg.rb

@@ -112,6 +112,11 @@ class ClientPkgPlugin < Servlet
   def del_package( pkg_name ); @client_build.del_package( pkg_name ); end
   def del_packages( packages ); @client_build.del_packages( packages ); end
   
+  def add_compound( compound_name, pkg_names ); @client_build.add_compound( compound_name, pkg_names ); end
+  def add_compounds( compounds ); @client_build.add_compounds( compounds ); end
+  def del_compound( compound_name ); @client_build.del_compound( compound_name ); end
+  def del_compounds( compounds ); @client_build.del_compounds( compounds ); end
+  
   def add_reserved_name( reserved_name ); @client_build.add_reserved_name( reserved_name ); end
   def add_reserved_names( reserved_names ); @client_build.add_reserved_names( reserved_names ); end
   def del_reserved_name( reserved_name ); @client_build.del_reserved_name( reserved_name ); end

data/plugins/client_pkg/lib/client_pkg_build.rb

@@ -213,7 +213,7 @@ class ClientPkgBuild
           begin
             coffee_src = read_file( src_path )
             js_data = CoffeeScript.compile( coffee_src, :bare => true )
-          rescue CoffeeScript::CompilationError
+          rescue CoffeeScript::CompilationError, ExecJS::RuntimeError
             if has_js
               js_data = %{console.log( "WARNING: CoffeeScript complilation failed for source file #{src_path.to_json}, using the js variant instead." );}
               js_data += read_file( File.join( bundle_path, bundle_name+'.js' ) )
@@ -436,13 +436,15 @@ class ClientPkgBuild
       @logger.log(  "Compound package..............:    Source |   Minimized |   GNUZipped" )
       @logger.log(  "                              :           |             |" )
     end
-    @compound_config.each do |pkg_name, js_order|
+    @compounds.each do |pkg_name, js_order|
       js_size = 0
       pkg_parts = []
       js_order.each do |js_pkg|
         pkg_part = @js[ js_pkg ]
         pkg_parts.push( pkg_part )
-        js_size += ( @package_origsizes[ js_pkg ] or @destination_origsize[ js_pkg ] )
+        pkg_size = ( @package_origsizes[ js_pkg ] or @destination_origsize[ js_pkg ] or 0 )
+        warn "nil pkg size of: #{js_pkg}" if pkg_size.nil?
+        js_size += pkg_size.nil? ? 0 : pkg_size
       end
       js_src = pkg_parts.join("\n")
       @js[ pkg_name ] = js_src
@@ -623,6 +625,27 @@ class ClientPkgBuild
     packages.each { |pkg_name| del_package( pkg_name ) }
   end
   
+  def add_compound( compound_name, pkg_names )
+    if @compounds.has_key?( compound_name )
+      warn "Compound #{compound_name} already exists, ignoring."
+    else
+      @compounds[ compound_name ] = pkg_names
+    end
+  end
+  def add_compounds( compounds )
+    compounds.each do | compound_name, pkg_names |
+      add_compound( compound_name, pkg_names )
+    end
+  end
+  def del_compound( compound_name )
+    if @compounds.has_key?( compound_name )
+      @compounds.delete( compound_name )
+    end
+  end
+  def del_compounds( compounds )
+    compounds.each { |compound_name| del_compound( compound_name ) }
+  end
+
   def add_reserved_name( reserved_name )
     @reserved_names.push( reserved_name ) unless @reserved_names.include? reserved_name
   end
@@ -719,7 +742,7 @@ class ClientPkgBuild
     @no_whitespace_removal = config[:no_whitespace_removal]
     @debug = RSence.args[:debug]
     @quiet = (not RSence.args[:verbose] and RSence.args[:suppress_build_messages])
-    @compound_config = config[:compound_packages]
+    @compounds = config[:compound_packages]
   end
   
   def find_newer( src_dir, newer_than, quiet=false )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsence
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsence-deps