rsence 2.2.3 → 2.2.4

data/VERSION

@@ -1 +1 @@
-2.2.3
+2.2.4

data/js/controls/textcontrol/textcontrol.js

@@ -373,7 +373,8 @@ HNumericTextControl = HTextControl.extend({
   defaultEvents: {
     mouseWheel: true,
     textEnter: true,
-    contextMenu: true
+    contextMenu: true,
+    keyDown: true
   },
   
 /** Uses the mouseWheel event to step up/down the value.
@@ -384,6 +385,18 @@ HNumericTextControl = HTextControl.extend({
     this.setValue(Math.round(this.validateText(_value)));
   },
 
+  keyDown: function(_key){
+    if(_key===Event.KEY_UP){
+      this.mouseWheel(1);
+      return true;
+    }
+    else if(_key===Event.KEY_DOWN){
+      this.mouseWheel(-1);
+      return true;
+    }
+    return false;
+  },
+
 /** = Description
   * Extends the validateText method to ensure the
   * input is a number.

data/js/foundation/eventmanager/eventmanager.js

@@ -137,20 +137,55 @@ EVENT = {
     _this.hoverTimer = new Date().getTime();
     // Time since last hover event triggered
   },
+
+
+  // cleans up events that would be lost when browser window is blurred
+  _domWindowBlur: function(){
+    // console.log('window blurred');
+    var
+    _this = EVENT,
+    _status = _this.status;
+    // _status[_this.button1] = false;
+    // _status[_this.button2] = false;
+    // _status[_this.crsrX] = -1;
+    // _status[_this.crsrY] = -1;
+    _status[_this.keysDown] = [];
+    _status[_this.altKeyDown] = false;
+    _status[_this.ctrlKeyDown] = false;
+    _status[_this.shiftKeyDown] = false;
+    _status[_this.metaKeyDown] = false;
+    _status[_this.cmdKeyDown] = false;
+    _this.enableDroppableChecks = false;
+    if( HSystem.defaultInterval !== HSystem._blurredInterval ){
+      _this._sysDefaultInterval = HSystem.defaultInterval;
+      COMM.Queue.push( function(){
+        HSystem.defaultInterval = HSystem._blurredInterval;
+      } );
+    }
+  },
+  _domWindowFocus: function(){
+    var
+    _this = EVENT;
+    _this.enableDroppableChecks = _this._origDroppableChecks;
+    if( HSystem.defaultInterval === HSystem._blurredInterval && _this._sysDefaultInterval ){
+      COMM.Queue.push( function(){
+        HSystem.defaultInterval = _this._sysDefaultInterval;
+      } );
+    }
+    // console.log('window focused');
+  },
   
 /** Starts event listening.
   **/
   start: function() {
     var _globalEventTargetElement = (BROWSER_TYPE.ie && !BROWSER_TYPE.ie9)?document:window,
         _this = EVENT;
-        // _eventMap = [
     Event.observe( _globalEventTargetElement, 'mousemove', _this.mouseMove );
     Event.observe( _globalEventTargetElement, 'mouseup', _this.mouseUp );
     Event.observe( _globalEventTargetElement, 'mousedown', _this.mouseDown );
     Event.observe( _globalEventTargetElement, 'click', _this.click );
     Event.observe( _globalEventTargetElement, 'keyup', _this.keyUp );
     Event.observe( _globalEventTargetElement, 'keydown', _this.keyDown );
-    // IE and WebKit browsers don't need keyPress for repeat
     if( !BROWSER_TYPE.safari && !BROWSER_TYPE.ie){
       Event.observe( _globalEventTargetElement, 'keypress', _this.keyPress );
     }
@@ -158,16 +193,13 @@ EVENT = {
     Event.observe( _globalEventTargetElement, 'resize', _this.resize );
     Event.observe( _globalEventTargetElement, 'mousewheel', _this.mouseWheel );
     Event.observe( _globalEventTargetElement, 'dblclick', _this.doubleClick );
-        // ],
-        // i = 0;
-    // for (; i !== _eventMap.length; i++) {
-    // Event.observe(_globalEventTargetElement, _eventMap[i][0], _eventMap[i][1]);
-    // }
     if (window.addEventListener) {
       window.addEventListener('DOMMouseScroll', EVENT.mouseWheel, false);
       window.addEventListener('resize', EVENT.resize, false);
     }
-    //window.onmousewheel=document.onmousewheel=EVENT.mouseWheel;
+    _this._origDroppableChecks = _this.enableDroppableChecks;
+    Event.observe( window, 'blur', _this._domWindowBlur );
+    Event.observe( window, 'focus', _this._domWindowFocus );
     _this.listeners = [];
     // keep elemId buffer of all listeners
     _this.focused = [];
@@ -458,18 +490,37 @@ EVENT = {
     clearTimeout(_this._lastCoordFlushTimeout);
     
     // send drag event to all drag-interested ctrls
-    for (; i !== _this.dragItems.length; i++) {
+    for (; i < _this.dragItems.length; i++) {
       _elemId = _this.dragItems[i];
       _this.focusOptions[_elemId].ctrl.drag(x, y);
       _this.coordCacheFlush(_elemId);
       _currentlyDragging = true;
     }
+    if(!_currentlyDragging){
+      if (new Date().getTime() > _this.hoverTimer + _this.hoverInterval) {
+        // sends mouseMove pseudo-events to ctrls interested
+        for (i = 0; i < _this.coordListeners.length; i++) {
+          _elemId = _this.coordListeners[i];
+          _ctrl = _this.focusOptions[_elemId].ctrl;
+          _ctrl.mouseMove(x, y);
+        }
+        _this.hoverTimer = new Date().getTime();
+      }
+      else {
+        _this._lastCoordFlushTimeout = setTimeout(
+          function(){
+            EVENT.flushMouseMove(x,y);
+          }, _this.hoverInterval
+        );
+      }
+      return false;
+    }
 
     if (_this.enableDroppableChecks) {
       // Check which items are under the mouse coordinates now.
       if (new Date().getTime() > _this.hoverTimer + _this.hoverInterval) {
         // sends mouseMove pseudo-events to ctrls interested
-        for (i = 0; i !== _this.coordListeners.length; i++) {
+        for (i = 0; i < _this.coordListeners.length; i++) {
           _elemId = _this.coordListeners[i];
           _ctrl = _this.focusOptions[_elemId].ctrl;
           _ctrl.mouseMove(x, y);
@@ -479,7 +530,7 @@ EVENT = {
         }
         // sends drag&drop pseudo-events
         var _wasTopmostDroppable;
-        for (i = 0; i !== _this.dragItems.length; i++) {
+        for (i = 0; i < _this.dragItems.length; i++) {
           // Find the current droppable while dragging.
           _wasTopmostDroppable = _this.topmostDroppable;
           _this.topmostDroppable = null;
@@ -529,7 +580,7 @@ EVENT = {
         );
       }
     }
-    return _currentlyDragging;
+    return true;
   },
 
   // Loops through all registered items and store indices of elements
@@ -547,7 +598,7 @@ EVENT = {
         _size,
         _coords,
         _hovered = [];
-    for (; i !== _this.listeners.length; i++) {
+    for (; i < _this.listeners.length; i++) {
       if (!_this.listeners[i] || !_this.focusOptions[i].ctrl) {
         continue;
       }
@@ -629,7 +680,7 @@ EVENT = {
       _this.status[_this.button2] = true;
     }
     
-    for (; i !== _this.focused.length; i++) {
+    for (; i < _this.focused.length; i++) {
       if (_this.focused[i] === true) {
         // Set the active control to the currently focused item.
         if (_this.focusOptions[i].ctrl.enabled) {
@@ -648,14 +699,14 @@ EVENT = {
       _this.changeActiveControl(_newActiveControl);
     }
     // Call the mouseDown and startDrag events after the active control change has been handled.
-    for (i = 0; i !== _startDragElementIds.length; i++) {
+    for (i = 0; i < _startDragElementIds.length; i++) {
       _this.dragItems.push(_startDragElementIds[i]);
       _this.focusOptions[_startDragElementIds[i]].ctrl.startDrag(x, y, _isLeftButton);
       _didStartDrag = true;
     }
 
     var _stopEvent = _mouseDownElementIds.length;
-    for (i = 0; i !== _mouseDownElementIds.length; i++) {
+    for (i = 0; i < _mouseDownElementIds.length; i++) {
       if (_this.focusOptions[_mouseDownElementIds[i]].ctrl.mouseDown(x, y, _isLeftButton)) {
         _stopEvent--;
       }
@@ -721,7 +772,7 @@ EVENT = {
     if(!_isLeftButton){
       return true;
     }
-    for (; i !== _this.focused.length; i++) {
+    for (; i < _this.focused.length; i++) {
       if (_this.focused[i] === true) {
         // Set the active control to the currently focused item.
         if (_this.focusOptions[i].ctrl.enabled) {
@@ -738,7 +789,7 @@ EVENT = {
       _this.changeActiveControl(_newActiveControl);
     }
     var _stopEvent = _clickElementIds.length;
-    for (i = 0; i !== _clickElementIds.length; i++) {
+    for (i = 0; i < _clickElementIds.length; i++) {
       if (_this.focusOptions[_clickElementIds[i]].ctrl.click(x, y, _isLeftButton)) {
         _stopEvent--;
       }
@@ -827,7 +878,7 @@ EVENT = {
     i = 0;
     _this._modifiers(e);
     // Send endDrag for the currently dragged items even when they don't have focus, and clear the drag item array.
-    for (; i !== _this.dragItems.length; i++) {
+    for (; i < _this.dragItems.length; i++) {
       _elemId = _this.dragItems[i];
       _ctrl = _this.focusOptions[_elemId].ctrl;
       _ctrl.endDrag(x, y, _isLeftButton);
@@ -888,10 +939,12 @@ EVENT = {
         i = 0;
     _this._modifiers(e);
     // Check for doubleClick listeners.
-    for (i = 0; i !== _this.focused.length; i++) {
+    for (i = 0; i < _this.focused.length; i++) {
       if (_this.focused[i] === true) {
         if (_this.focusOptions[i].doubleClick === true) {
-          _this.focusOptions[i].ctrl.doubleClick(x, y, true);
+          if ( _this.focusOptions[i].ctrl.doubleClick(x, y, true) ){
+            Event.stop(e);
+          }
         }
       }
     }
@@ -919,7 +972,7 @@ EVENT = {
     if (BROWSER_TYPE.opera || BROWSER_TYPE.safari || BROWSER_TYPE.ie) {
       _delta = 0 - _delta;
     }
-    for (; i !== _this.focused.length; i++) {
+    for (; i < _this.focused.length; i++) {
       if (_this.focused[i] === true) {
         if (_this.focusOptions[i].mouseWheel === true) {
           Event.stop(e);
@@ -948,7 +1001,7 @@ EVENT = {
         i = 0;
     _this._modifiers(e);
     // Check for contextMenu listeners.
-    for (i = 0; i !== _this.focused.length; i++) {
+    for (i = 0; i < _this.focused.length; i++) {
       if (_this.focused[i] === true) {
         if (_this.focusOptions[i].contextMenu === true) {
           if( _this.focusOptions[i].ctrl.contextMenu() ){
@@ -989,7 +1042,7 @@ EVENT = {
       }
     }
     // Insert key to the realtime array, remove in keyUp
-    if (_this.isKeyDown(_keyCode)) {
+    if(!_this.isKeyDown(_keyCode)) {
       _this.status[_this.keysDown].push(_keyCode);
     }
     if (!_this.status[_this.cmdKeyDown] && _stopEvent){
@@ -1038,7 +1091,7 @@ EVENT = {
       _this.status[_this.cmdKeyDown] = false;
     }
     // Remove the key from the realtime array, inserted in keyDown
-    if(!_this.isKeyDown(_keyCode)){
+    if(_this.isKeyDown(_keyCode)){
       _keyCodeIndex = _this.status[_this.keysDown].indexOf(_keyCode);
       _this.status[_this.keysDown].splice(_keyCodeIndex, 1);
     }

data/js/foundation/system/system.js

@@ -44,6 +44,9 @@ HSystem = {
   
 /** The default HSystem ticker interval. Unit is milliseconds. **/
   defaultInterval: 10,
+
+// The ticker interval, when window has no focus.
+  _blurredInterval: 300,
   
 /** The default HApplication priority. Unit is "On the n:th tick: poll". **/
   defaultPriority: 20,

data/lib/rsence/sessionstorage.rb

@@ -240,7 +240,9 @@ module RSence
       end
       puts "Storing sessions..." if RSence.args[:verbose]
       db_open
-      @sessions.each do |ses_id,ses_data|
+      ses_ids = @sessions.keys
+      ses_ids.each do |ses_id|
+        ses_data = @sessions[ses_id]
         if @plugins
           @plugins.delegate( :dump_ses, ses_data )
           @plugins.delegate( :dump_ses_id, ses_id )

data/plugins/client_pkg/lib/client_pkg_build.rb

@@ -442,8 +442,8 @@ class ClientPkgBuild
       js_order.each do |js_pkg|
         pkg_part = @js[ js_pkg ]
         pkg_parts.push( pkg_part )
-        pkg_size = ( @package_origsizes[ js_pkg ] or @destination_origsize[ js_pkg ] or 0 )
-        warn "nil pkg size of: #{js_pkg}" if pkg_size.nil?
+        pkg_size = ( @package_origsizes[ js_pkg ] or @destination_origsize[ js_pkg ] or @compound_origsize[ js_pkg ] )
+        warn "nil pkg size of: #{js_pkg}" if pkg_size.nil? or pkg_size == 0
         js_size += pkg_size.nil? ? 0 : pkg_size
       end
       js_src = pkg_parts.join("\n")
@@ -459,6 +459,7 @@ class ClientPkgBuild
         else
           gz_size  = gz_data.bytesize
         end
+        @compound_origsize[ pkg_name ] = js_size
         print_stat( pkg_name, js_size, jsc_size, gz_size )
       end
     end
@@ -496,6 +497,7 @@ class ClientPkgBuild
   def compose_destinations
     @destination_files = {} # rename to package_products
     @destination_origsize = {}
+    @compound_origsize = {}
     @package_names.each do |package_name|
       @packages[package_name].each do |bundle_name|
         if @bundles_found.has_key?( bundle_name )

metadata

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