rsence-pre 2.2.2.1 → 2.3.0.0

data/js/controls/window/window.js

@@ -359,7 +359,7 @@ HWindow = HDynControl.extend({
       _fitsRect.setHeight( this.options.minSize[1] );
     }
     // doesn't fit or right-clicked or alt-clicked, maximize:
-    if (!_fitsRect.equals(_maxRect) && (EVENT.status[ EVENT.button2 ] || EVENT.status[ EVENT.altKeyDown ]) ){
+    if (!_fitsRect.equals(_maxRect) && (EVENT.status.button2 || EVENT.status.altKeyDown) ){
       // console.log('force-max');
       this.animateTo( _maxRect );
       this.prevRect = HRect.nu( this.rect );

data/js/core/class/class.js

@@ -139,7 +139,7 @@ HClass.prototype = {
     return this;
   },
   /** = Description
-    * If a method has been overridden then the base method provides access to the overridden method. 
+    * If a method has been overridden then the base method provides access to the overridden method.
     * Call this method from any other method to invoke that method's ancestor.
     * It is also possible to call the base method from within a constructor function.
     *
@@ -205,7 +205,7 @@ HClass.extend = function(_instance, _static) {
   HClass._prototyping = true;
   // this is base for single instance or prototype (class structure) for object that are created
   // from this class
-  _prototype = new this;
+  _prototype = new this();
   // copies properties and methods from _instance to _prototype (class structure)
   _extend.call(_prototype, _instance);
   // this constructor came from _instance
@@ -329,8 +329,8 @@ try {
 // console.log surrogate for browsers without a console
 if(window['console']===undefined){
   window.console = {
-    log: function(){
-    }
+    log: function(){},
+    warn: function(){}
   };
 }
 

data/js/core/event/event.js

@@ -65,11 +65,11 @@ Event = {
     if (!Event.observers) {
       Event.observers = [];
     }
-    if (_elem.addEventListener) {
+    if (_elem && _elem.addEventListener) {
       this.observers.push([_elem, _name, _function, _useCapture]);
       _elem.addEventListener(_name, _function, _useCapture);
     }
-    else if (_elem.attachEvent) {
+    else if (_elem && _elem.attachEvent) {
       this.observers.push([_elem, _name, _function, _useCapture]);
       _elem.attachEvent("on" + _name, _function);
     }
@@ -98,6 +98,7 @@ Event = {
   observe: function(_elem, _name, _function, _useCapture) {
     _useCapture = _useCapture || false;
     Event._observeAndCache(_elem, _name, _function, _useCapture);
+    return _function;
   },
   
 /** Stops observing the named event of the element and

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.status.shiftKeyDown
+      @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/control.js

@@ -16,6 +16,8 @@
   **/
 var//RSence.Foundation
 HControl = HView.extend({
+
+  isCtrl: true,
   
 /** A flag: when true, calls the +refreshValue+ method whenever
   * +self.value+ is changed.

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/control/eventresponder/eventresponder.js

@@ -28,6 +28,8 @@
   **                         on the droppable.
   ** +startHover+::          Called when a draggable item is moved 
   **                         over the droppable.
+  ** +hover+::               Called while a dragged item is moved between
+  **                         startHover and endHover.
   ** +endHover+::            Called when a draggable item is moved out 
   **                         of the droppable.
   ** +keyDown+::             Called when the user presses a key, and 
@@ -154,10 +156,11 @@ HEventResponder = HClass.extend({
         click:       false,
         resize:      false,
         doubleClick: false,
-        contextMenu: false
+        contextMenu: false,
+        rectHover:   false,
+        multiDrop:   false
       } ).extend( this.defaultEvents ).extend( _events?_events:{} ).nu();
     }
-    this.events.ctrl = this;
     EVENT.reg( this, this.events );
     return this;
   },
@@ -487,7 +490,7 @@ HEventResponder = HClass.extend({
     if(this.enabled) {
       this.toggleCSSClass(this.elemId, HControl.CSS_ACTIVE, true);
     }
-    this.gainedActiveStatus(_lastActiveControl);
+    return this.gainedActiveStatus(_lastActiveControl);
   },
   
   
@@ -644,7 +647,6 @@ HEventResponder = HClass.extend({
   *
   **/
   endDrag: function(x, y) {
-    this.invalidatePositionCache();
   },
 
 /** = Description
@@ -678,6 +680,10 @@ HEventResponder = HClass.extend({
   },
   onHoverStart: function(obj) {},
   
+  hover: function(obj){
+
+  },
+
 /** = Description
   * Default endHover event responder method. Does nothing by default.
   * Extend the endHover method, if you want to do something 
@@ -763,21 +769,24 @@ HEventResponder = HClass.extend({
     EVENT.blur(_this);
     Event.stop(e);
   },
-  
-  
-/** = Description
-  * Forces retrieving this control's DOM element position directly rather than
-  * using the cached version when the position is needed by +EVENT+.
-  * Child controls are invalidated recursively by +HView+.
-  *
-  * = Returns
-  * +self+
-  * 
+
+/** Selection handling; currently under construction
   **/
-  invalidatePositionCache: function() {
-    this.base();
-    EVENT.coordCacheFlush(this.elemId);
-    return this;
-  }
-  
+  selected: false,
+  select: function(){
+    this.selected = true;
+    console.warn("HControl#select not supported yet.");
+  },
+  deSelect: function(){
+    this.selected = false;
+    console.warn("HControl#deSelect not supported yet.");
+  },
+  setSelected: function(_state){
+    if( _state ){
+      this.select();
+    }
+    else {
+      this.deSelect();
+    }
+  }  
 });