rsence-pre 3.0.0.8 → 3.0.0.9

data/client/js/foundation/eventmanager/eventmanager.coffee

@@ -340,6 +340,9 @@ EventManagerApp = HApplication.extend
       return false
     return true
   #
+  # Queue of items to check for focus, because it's fairly slow directly:
+  _topmostQueue: []
+  #
   # Converts eventOptions into a list of enabled event names
   _setEventOptions: (_ctrl,_eventOptions,_warnMethodName)->
     _warnMethodName = '[unknown]' unless _warnMethodName
@@ -377,9 +380,7 @@ EventManagerApp = HApplication.extend
       @_listeners.enabled.unshift( _viewId ) unless ~@_listeners.enabled.indexOf(_viewId)
       _elem = ELEM.get( _ctrl.elemId )
       [ x, y ] = @status.crsr
-      _matchIds = @_findTopmostEnabled( HPoint.new( x, y ), 'contains', null )
-      if ~_matchIds.indexOf( _viewId )
-        @changeActiveControl( _ctrl )
+      @_topmostQueue.push( [ HPoint.new( x, y ), _ctrl ] )
   #
   # Releases bindings done by #_setEventOptions
   _unsetEventOptions: (_ctrl,_warnMethodName)->
@@ -396,7 +397,6 @@ EventManagerApp = HApplication.extend
         _intersectHoverIdx = @_listeners._rectHoverIntersectMode.indexOf( _viewId )
         if ~_intersectHoverIdx
           @_listeners._rectHoverIntersectMode.splice( _intersectHoverIdx, 1 )
-    _wasFocused = false
     _elem = ELEM.get( _ctrl.elemId )
     for _statusItem in [ 'dragged', 'selected', 'hovered', 'active', 'focused', 'enabled' ]
       _viewIdx = @_listeners[_statusItem].indexOf(_viewId)
@@ -411,7 +411,6 @@ EventManagerApp = HApplication.extend
           _ctrl._lostActiveStatus( null )
         else if _statusItem == 'focused'
           @blur( _ctrl )
-          _wasFocused = true
         else if _statusItem == 'enabled'
           _ctrl.setEnabled( false ) if _ctrl.enabled
         _viewIdx = @_listeners[_statusItem].indexOf(_viewId)
@@ -736,8 +735,17 @@ EventManagerApp = HApplication.extend
     if _active.length != 1
       @warn "Danger, too many active items: #{JSON.stringify(_active)}"
     for _viewId in _active.slice()
+      if _viewId == null
+        console.warn('encountered null viewId in active listeners!')
+        _idx = _active.indexOf( _viewId )
+        while ~_idx
+          _idx = _active.indexOf( _viewId )
+          _active.splice( _idx, 1 )
+        continue
       continue if _newActive != null and _viewId == _newActive.viewId
       _ctrl = @_views[_viewId]
+      if _ctrl.isDead and !@isProduction
+        console.warn('trying to deactivate dead control!')
       _ctrl.active = false
       _idx = _active.indexOf( _viewId )
       _dragIdx = _dragged.indexOf(_viewId)
@@ -1116,25 +1124,21 @@ EventManagerApp = HApplication.extend
   # a special default rule of auto-selecting the active control and
   # checking all of its siblings before traversing.
   defaultKey: (_methodName,_ctrl)->
-    if _ctrl?
-      return true if _ctrl[_methodName]? and _ctrl[_methodName]()
-    else # first special rules, check same
-      return null unless @_listeners.active
-      _ctrl = @_views[@_listeners.active[0]]
-      return true if _ctrl[_methodName]? and _ctrl[_methodName]()
-      _stop = null
-      for _viewId in _ctrl.parent.views
-        continue if _ctrl.viewId == _viewId
-        _ctrl = @_views[_viewId]
-        if _ctrl[_methodName]?
-          _stopStatus = _ctrl[_methodName]()
-          if _stopStatus == false or _stopStatus == true
-            _stop = _stopStatus unless _stop
-        if _stop != null
-          return _stop
-    if _ctrl.parent?
-      return true if @defaultKey(_methodName,_ctrl.parent)
-    return null
+    return true if _ctrl? and _ctrl[_methodName]? and _ctrl[_methodName]() == true
+    return null unless @_listeners.active
+    _ctrl = @_views[@_listeners.active[0]]
+    return true if _ctrl[_methodName]? and _ctrl[_methodName]() == true
+    _stop = null
+    for _viewId in _ctrl.parent.views
+      continue if _ctrl.viewId == _viewId
+      _ctrl = @_views[_viewId]
+      if _ctrl[_methodName]?
+        _stopStatus = _ctrl[_methodName]()
+        if _stopStatus == false or _stopStatus == true
+          _stop = _stopStatus unless _stop
+      return _stop if _stop != null
+    return true if _ctrl.parent? and @defaultKey(_methodName,_ctrl.parent) == true
+    null
   #
   # Handles the keyDown event
   keyDown: (e)->
@@ -1219,13 +1223,27 @@ EventManagerApp = HApplication.extend
     @warn('EventManager#isCmdKeyDown is deprecated, use #status.cmdKeyDown instead')
     @status.altKeyDown
   #
-  # Debug output
-  # idle: ->
-  #   console.log( 'focused: ',
-  #     JSON.stringify(@_listeners.focused),'active:',
-  #     JSON.stringify(@_listeners.active),'dragged:',
-  #     JSON.stringify(@_listeners.dragged),'hovered:',
-  #     JSON.stringify(@_listeners.hovered) )
+  idle: ->
+    if @_topmostQueue.length
+      _items = []
+      _lastPoint = false
+      for i in [0..(@_topmostQueue.length-1)]
+        [ _point, _ctrl ] = @_topmostQueue.shift()
+        _lastPoint = _point
+        continue if _ctrl.isDead
+        continue unless _ctrl.enabled
+        _items.push( _ctrl )
+      _matchIds = @_findTopmostEnabled( _lastPoint, 'contains', null )
+      for _ctrl in _items
+        _viewId = _ctrl.viewId
+        if ~_matchIds.indexOf( _viewId )
+          @changeActiveControl( _ctrl )
+    # Debug output
+    # console.log( 'focused: ',
+    # JSON.stringify(@_listeners.focused),'active:',
+    # JSON.stringify(@_listeners.active),'dragged:',
+    # JSON.stringify(@_listeners.dragged),'hovered:',
+    # JSON.stringify(@_listeners.hovered) )
   #
   # Cleans up structures
   die: ->
@@ -1233,7 +1251,7 @@ EventManagerApp = HApplication.extend
     @base()
 
 LOAD( ->
-  window.EventManager = EventManagerApp.new( 500, 'EventManager' )
+  window.EventManager = EventManagerApp.new( 40, 'EventManager' )
   # Alias:
   window.EVENT = EventManager
   EventManager.start()

data/client/js/foundation/geom/rect/rect.js

@@ -53,7 +53,7 @@ HRect = HClass.extend({
   constructor: function() {
     this.viewIds = [];
     var _args=arguments;
-    
+
     if (_args.length === 0) {
       this._constructorDefault();
     } else if (_args.length === 4) {
@@ -126,7 +126,7 @@ HRect = HClass.extend({
       return [ _this.left, _this.top, _this.width, _this.height ];
     }
   },
-  
+
   _updateFlexibleDimensions: function(){
     var
     _this = this,
@@ -146,6 +146,15 @@ HRect = HClass.extend({
     _view = HSystem.views[_viewId];
     if(_view.flexRight || _view.flexBottom){
       ELEM.flush();
+      //// This will increase performance somewhat, but needs to be broader than it is:
+      // var i=0,_parentElemIds=[_view.elemId],_parentView;
+      // for(;i<_view.parents.length;i++){
+      //   _parentView = _view.parents[i];
+      //   if(_parentView && _parentView.elemId !== null && _parentView.elemId !== undefined){
+      //     _parentElemIds.push(_parentView.elemId);
+      //   }
+      // }
+      // ELEM.flushElem(_parentElemIds);
       _parentSize = _view.parentSize();
       if( _view.flexRight && _view.flexLeft ){ // calculate width and right
         _virtualWidth = _parentSize[0] - _this.left - _view.flexRightOffset;
@@ -198,9 +207,9 @@ HRect = HClass.extend({
   *
   **/
   updateSecondaryValues: function(_noSize) {
-    
+
     // this._updateFlexibleDimensions();
-    
+
     /**
       * isValid is true if the Rect's right side is greater than or equal to its left
       * and its bottom is greater than or equal to its top, and false otherwise.
@@ -208,7 +217,7 @@ HRect = HClass.extend({
       * the frame of a view or window).
       **/
     this.isValid = ( this.right >= this.left && this.bottom >= this.top );
-    
+
     /**
       *
       * The Point-returning functions return the coordinates of one of the
@@ -218,7 +227,7 @@ HRect = HClass.extend({
     this.leftBottom = new HPoint(this.left, this.bottom);
     this.rightTop = new HPoint(this.right, this.top);
     this.rightBottom = new HPoint(this.right, this.bottom);
-    
+
     /**
       * The width and height of a Rect's rectangle, as returned through these
       * properties.
@@ -227,9 +236,11 @@ HRect = HClass.extend({
       this.width = (this.right - this.left);
       this.height = (this.bottom - this.top);
     }
+    this.position = [ this.left, this.top ];
+    this.size = [ this.width, this.height ];
     return this;
   },
-  
+
 /** = Description
   * Sets the object's rectangle by defining the coordinates of all four
   * sides.
@@ -248,7 +259,7 @@ HRect = HClass.extend({
   **/
   set: function() {
     var _args=arguments;
-    
+
     if (_args.length === 0) {
       this._constructorDefault();
     } else if (_args.length === 4) {
@@ -266,7 +277,7 @@ HRect = HClass.extend({
     this.updateSecondaryValues();
     return this;
   },
-  
+
 /** = Description
   * Moves the rect's left side to a new coordinate.
   *
@@ -279,7 +290,7 @@ HRect = HClass.extend({
     this.updateSecondaryValues();
     return this;
   },
-  
+
 /** = Description
   * Moves the rect's right side to a new coordinate.
   *
@@ -292,7 +303,7 @@ HRect = HClass.extend({
     this.updateSecondaryValues();
     return this;
   },
-  
+
 /** = Description
   * Moves the rect's top side to a new coordinate.
   *
@@ -305,7 +316,7 @@ HRect = HClass.extend({
     this.updateSecondaryValues();
     return this;
   },
-  
+
 /** = Description
   * Moves the rect's bottom side to a new coordinate.
   *
@@ -318,7 +329,7 @@ HRect = HClass.extend({
     this.updateSecondaryValues();
     return this;
   },
-  
+
 /** = Description
   * Moves the rects left and top sides to a new point. Affects the position,
   * width and height.
@@ -333,7 +344,7 @@ HRect = HClass.extend({
     this.updateSecondaryValues();
     return this;
   },
-  
+
 /** = Description
   * Moves the rects left and bottom sides to a new point. Affects the left
   * position, width and height.
@@ -348,7 +359,7 @@ HRect = HClass.extend({
     this.updateSecondaryValues();
     return this;
   },
-  
+
 /** = Description
   * Moves the rects right and top sides to a new point. Affects the top
   * position, width and height.
@@ -363,7 +374,7 @@ HRect = HClass.extend({
     this.updateSecondaryValues();
     return this;
   },
-  
+
 /** = Description
   * Moves the rects right and bottom sides to a new point. Affects the width
   * and height. Does not affect the position.
@@ -378,7 +389,7 @@ HRect = HClass.extend({
     this.updateSecondaryValues();
     return this;
   },
-  
+
 /** = Description
   * Moves the rects right side to a new coordinate. Does not affect the position.
   *
@@ -435,7 +446,7 @@ HRect = HClass.extend({
     this.updateSecondaryValues();
     return this;
   },
-  
+
 /** = Description
   * Returns true if the Rect has any area even a corner or part
   * of a side in common with rect, and false if it doesn't.
@@ -464,12 +475,12 @@ HRect = HClass.extend({
   overlaps: function( _rect, _insetbyX, _insetByY ){
     return this.intersects( _rect, _insetbyX, _insetByY );
   },
-  
+
 /** = Description
   * Returns true if point or rect lies entirely within the Rect's
   * rectangle (and false if not). A rectangle contains the points that lie
   * along its edges; for example, two identical rectangles contain each other.
-  * 
+  *
   * Also works with HPoint instances.
   *
   * = Parameters
@@ -498,7 +509,7 @@ HRect = HClass.extend({
     return ( _rect.left >= this.left && _rect.right <= this.right &&
              _rect.top >= this.top && _rect.bottom <= this.bottom );
   },
-  
+
 /** = Description
   * Insets the sides of the Rect's rectangle by x units (left and
   * right sides) and y units (top and bottom). Positive inset values shrink
@@ -537,7 +548,7 @@ HRect = HClass.extend({
     this.right -= x;
     this.bottom -= y;
   },
-  
+
 /** = Description
   * Moves the Rect horizontally by x units and vertically by y
   * units. The rectangle's size doesn't change.
@@ -572,7 +583,7 @@ HRect = HClass.extend({
     this.right += x;
     this.bottom += y;
   },
-  
+
 /** = Description
   * Moves the Rect to the location (x,y).
   *
@@ -606,7 +617,7 @@ HRect = HClass.extend({
     this.bottom += y-this.top;
     this.top = y;
   },
-  
+
 /** = Description
   * Returns true if the two objects' rectangles exactly coincide.
   *
@@ -621,7 +632,7 @@ HRect = HClass.extend({
     return (this.left === _rect.left && this.top === _rect.top &&
             this.right === _rect.right && this.bottom === _rect.bottom);
   },
-  
+
 /** = Description
   * Creates and returns a new Rect that's the intersection of this Rect and
   * the specified Rect. The new Rect encloses the area that the two Rects have
@@ -640,7 +651,7 @@ HRect = HClass.extend({
        Math.min(this.right, _rect.right), Math.min(this.bottom, _rect.bottom)
     );
   },
-  
+
 /** = Description
   * Creates and returns a new Rect that minimally but completely encloses the
   * area defined by this Rect and the specified Rect.
@@ -658,10 +669,10 @@ HRect = HClass.extend({
       Math.max(this.right, _rect.right), Math.max(this.bottom, _rect.bottom)
     );
   },
-  
+
   // HValue and HView support
   valueObj: null,
-  
+
 /** = Description
   * Bind function
   *
@@ -676,7 +687,7 @@ HRect = HClass.extend({
     this._updateFlexibleDimensions();
     return this;
   },
-  
+
 /** = Description
   * Release function
   **/
@@ -687,7 +698,7 @@ HRect = HClass.extend({
     }
     return this;
   },
-  
+
 /** = Description
   * Sets valueObj for this component given as parameter.
   *
@@ -699,7 +710,7 @@ HRect = HClass.extend({
     this.valueObj = _valueObj;
     return this;
   },
-  
+
 /** = Description
   * setValue function
   *
@@ -724,5 +735,5 @@ HRect = HClass.extend({
   toString: function(){
     return ('[object Rect left='+this.left+' top='+this.top+' width='+this.width+' height='+this.height+' right='+this.right+' bottom='+this.bottom+']');
   }
-  
+
 });

data/client/js/foundation/locale_settings/locale_settings.js

@@ -1,8 +1,15 @@
 
 var
-HLocale = {
+HLocale = (UtilMethods.extend({
+  setData: function(_locale){
+    this.updateObject(_locale,this);
+  },
   components: {
-    
+
+  },
+  general: {
+    decimalSeparator: '.',
+    thousandsSeparator: ''
   },
   compUnits: {
     strings: {
@@ -87,13 +94,18 @@ HLocale = {
       dateDelimitter: '.',
       timeDelimitter: ':',
       timeMsDelimitter: '.',
-      rangeDelimitter: ' ... '
+      rangeDelimitter: ' ... ',
+      dateFormat: 'YYYY-MM-DD',
+      timeFormat: 'HH:mm:ss',
+      dateTimeFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     settings: {
       zeroPadTime: true,
       AMPM: false
     },
     defaultOptions: {
+      useUTC: true,
+      tzMinutes: 0,
       longWeekDay: false,
       shortWeekDay: false,
       shortYear: false,
@@ -110,11 +122,10 @@ HLocale = {
       for( _key in _default ){
         _options[_key] = _default[_key];
       }
-      if( !_custom ){
-        _custom = {};
-      }
-      for( _key in _custom ){
-        _options[_key] = _custom[_key];
+      if( _custom ){
+        for( _key in _custom ){
+          _options[_key] = _custom[_key];
+        }
       }
       return _options;
     },
@@ -129,7 +140,7 @@ HLocale = {
       _this = HLocale.dateTime,
       _date = new Date( _dateTimeEpoch * 1000 ),
       _strings = _this.strings,
-      _wday = _date.getUTCDay();
+      _wday = _this.options().useUTC?_date.getUTCDay():_date.getDay();
       return _strings.weekDaysShort[ _wday ];
     },
     formatLongWeekDay: function( _dateTimeEpoch ){
@@ -137,26 +148,26 @@ HLocale = {
       _this = HLocale.dateTime,
       _date = new Date( _dateTimeEpoch * 1000 ),
       _strings = _this.strings,
-      _wday = _date.getUTCDay();
+      _wday = _this.options().useUTC?_date.getUTCDay():_date.getDay();
       return _strings.weekDaysLong[ _wday ];
     },
     formatDate: function( _dateTimeEpoch, _options ){
+      _options = this.options( _options );
       var
       _this = HLocale.dateTime,
       _date = new Date( _dateTimeEpoch * 1000 ),
       _strings = _this.strings,
-      _wday = _date.getUTCDay(),
-      _dateString = _date.getUTCDate() + _strings.dateDelimitter + (_date.getUTCMonth() + 1) + _strings.dateDelimitter;
-      
-      _options = _this.options( _options );
-      
+      _wday = _options.useUTC?_date.getUTCDay():_date.getDay(),
+      _dateString = _options.useUTC?(_date.getUTCDate() + _strings.dateDelimitter + (_date.getUTCMonth() + 1) + _strings.dateDelimitter):
+                                    (_date.getDate() + _strings.dateDelimitter + (_date.getMonth() + 1) + _strings.dateDelimitter);
+
       if( _options.fullYear ){
-        _dateString += _date.getUTCFullYear();
+        _dateString += _options.useUTC?_date.getUTCFullYear():_date.getFullYear();
       }
       else if( _options.shortYear ){
-        _dateString += date.getUTCYear();
+        _dateString += _options.useUTC?_date.getUTCYear():_date.getYear();
       }
-      
+
       if( _options.longWeekDay ){
         return _strings.weekDaysLong[_wday] + ' ' + _dateString;
       }
@@ -166,18 +177,18 @@ HLocale = {
       return _dateString;
     },
     formatTime: function( _dateTimeEpoch, _options ){
+      _options = this.options( _options );
       var
       _this = HLocale.dateTime,
       _date = new Date( _dateTimeEpoch * 1000 ),
       _strings = _this.strings,
-      _timeString = _this.zeroPadTime( _date.getUTCHours() ) + _strings.timeDelimitter + _this.zeroPadTime( _date.getUTCMinutes() );
-      
-      _options = _this.options( _options );
-      
+      _timeString = _options.useUTC?(_this.zeroPadTime( _date.getUTCHours() ) + _strings.timeDelimitter + _this.zeroPadTime( _date.getUTCMinutes() )):
+                                    (_this.zeroPadTime( _date.getHours() ) + _strings.timeDelimitter + _this.zeroPadTime( _date.getMinutes() ));
+
       if( _options.seconds ){
-        _timeString += _strings.timeDelimitter + _this.zeroPadTime( _date.getUTCSeconds() );
+        _timeString += _strings.timeDelimitter + _this.zeroPadTime( _options.useUTC?_date.getUTCSeconds():_date.getSeconds() );
         if( _options.milliSeconds ){
-          _timeString += _strings.timeMsDelimitter + _date.getUTCMilliseconds();
+          _timeString += _strings.timeMsDelimitter + _options.useUTC?_date.getUTCMilliseconds():_date.getMilliseconds;
         }
       }
       return _timeString;
@@ -187,4 +198,4 @@ HLocale = {
       return _this.formatDate( _dateTimeEpoch, _options ) + ' ' + _this.formatTime( _dateTimeEpoch, _options );
     }
   }
-};
+})).nu();