rsence-pre 2.2.2.1 → 2.3.0.0

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 = [];
@@ -431,8 +463,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;
@@ -457,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);
@@ -478,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;
@@ -528,7 +580,7 @@ EVENT = {
         );
       }
     }
-    return _currentlyDragging;
+    return true;
   },
 
   // Loops through all registered items and store indices of elements
@@ -546,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;
       }
@@ -628,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) {
@@ -647,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--;
       }
@@ -720,24 +772,31 @@ EVENT = {
     if(!_isLeftButton){
       return true;
     }
-    for (; i !== _this.focused.length; i++) {
+    var _fCount = 0;
+    for (; i < _this.focused.length; i++) {
       if (_this.focused[i] === true) {
+        _fCount+=1;
         // Set the active control to the currently focused item.
+
         if (_this.focusOptions[i].ctrl.enabled) {
           _newActiveControl = _this.focusOptions[i].ctrl;
         }
+        if(_this.traceFocused){
+          _newActiveControl.setStyle('border','2px solid #FF00FF');
+        }
         if (_this.focusOptions[i].click === true) {
           _clickElementIds.push(i);
         }
       }
     }
+    console.log('focused length:',_fCount);
     // Handle the active control selection.
     if (_newActiveControl) {
       // console.log('click new active control');
       _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--;
       }
@@ -775,6 +834,8 @@ EVENT = {
           // else{
           //   console.log('allow losing focus: ',_prevActiveCtrl.componentName,' -> ',_ctrl.componentName);
           // }
+          _this.blur(_prevActiveCtrl);
+          _this.focus(_ctrl);
           _prevActiveCtrl.active = false;
           if(_this.focusTrace){
             _prevActiveCtrl.setStyle('border','2px solid green');
@@ -798,6 +859,7 @@ EVENT = {
         _this.activeControl = null;
       }
     }
+
   },
 
 
@@ -826,7 +888,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);
@@ -887,10 +949,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);
+          }
         }
       }
     }
@@ -918,7 +982,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);
@@ -947,7 +1011,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() ){
@@ -988,7 +1052,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 +1101,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/json_renderer/json_renderer.js

@@ -271,7 +271,7 @@ COMM.JSONRenderer = HClass.extend({
     }
     if( !_isViewClass ){
       if( _hasRect ){
-        console.log( "renderNode warning; Supposedly rect-incompatible class supplied: "+_className );
+        !this.isProduction && console.log( "renderNode warning; Supposedly rect-incompatible class supplied: "+_className );
       }
     }
 
@@ -444,7 +444,9 @@ COMM.JSONRenderer = HClass.extend({
       }
     }
     catch (e){
-      console.log('renderNode error:',e.toString()+', rect:',_rect,', class:',_dataNode['class'],', options:', JSON.stringify(_options),', e:',e);
+      var _optStr;
+      console.log('err:',e);
+      COMM.Queue.clientException(e,{name:'renderNode error',options:_options,className:_className,rect:_rect});
     }
     // Iterates recursively through all subviews, if specified.
     if(_hasSubviews){

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/js/foundation/view/view.js

@@ -31,6 +31,9 @@
 ***/
 var//RSence.Foundation
 HView = HClass.extend({
+
+  isView: true,  // attribute to check if the object is a view
+  isCtrl: false, // attribute to check for if the object is a control
   
 /** Component specific theme path.
   **/
@@ -347,9 +350,6 @@ HView = HClass.extend({
     // Set the geometry
     this.setRect(_rect);
     
-    this._cachedLeft = _rect.left;
-    this._cachedTop = _rect.top;
-    
     // Additional DOM element bindings are saved into this array so they can be
     // deleted from the element manager when the view gets destroyed.
     this._domElementBindings = [];
@@ -541,8 +541,8 @@ HView = HClass.extend({
   **/
   _makeElem: function(_parentElemId){
     this.elemId = ELEM.make(_parentElemId,'div');
-    ELEM.setAttr( this.elemId, 'view_id', this.viewId );
-    ELEM.setAttr( this.elemId, 'elem_id', this.elemId );
+    ELEM.setAttr( this.elemId, 'view_id', this.viewId, true );
+    ELEM.setAttr( this.elemId, 'elem_id', this.elemId, true );
   },
   
 /** --
@@ -661,12 +661,6 @@ HView = HClass.extend({
         _this._updateZIndex();
       }
       
-      if ( _this._cachedLeft !== _rect.left || _this._cachedTop !== _rect.top) {
-        _this.invalidatePositionCache();
-        _this._cachedLeft = _rect.left;
-        _this._cachedTop = _rect.top;
-      }
-    
       _this.drawn = true;
     }
     return this;
@@ -1464,7 +1458,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);
     }
@@ -1977,24 +1971,6 @@ HView = HClass.extend({
   },
   
   
-/** = Description
-  * Invalidates event manager's element position cache for this view and its
-  * subviews. Actual functionality is implemented in HControl.
-  * 
-  * = Returns
-  * +self+
-  * 
-  **/
-  invalidatePositionCache: function() {
-    for(var i=0; i<this.views.length; i++) {
-      if( typeof HSystem.views[this.views[i]]['invalidatePositionCache'] === 'function' ){
-        HSystem.views[this.views[i]].invalidatePositionCache();
-      }
-    }
-    return this;
-  },
-  
-  
 /** = Description
   * Binds a DOM element to the +ELEM+ cache. This is a wrapper for
   * the ELEM#elem_bind that keeps track of the bound elements and

data/js/lists/listitems/listitems.js

@@ -32,7 +32,7 @@ HListItems = HValueResponder.extend({
       _parent = _rect;
     }
     else {
-      console.warn && console.warn( "Warning: the rect constructor argument of HListItems is deprecated." );
+      !this.isProduction && console.warn && console.warn( "Warning: the rect constructor argument of HListItems is deprecated." );
     }
     this.parent = _parent;
     if ( this.parent.setListItemResponder ){
@@ -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/lists/radiobuttonlist/radiobuttonlist.js

@@ -101,7 +101,7 @@ HRadioButtonList = HListItemControl.extend({
     this.base(_state);
     if(!this['listItemViews']){ return; }
     for(var i=0;i<this.listItems.length;i++){
-      this.listItemViews[i].setEnabled(_state)
+      this.listItemViews[i].setEnabled(_state);
     }
   },
   
@@ -122,7 +122,10 @@ HRadioButtonList = HListItemControl.extend({
       }
       if(_listItems[ this.value ] !== undefined){
         _value = _listItems[ this.value ];
-        this.parent.setValue( _value[0] );
+        if( this.parent.value !== _value[0] ){
+          // console.log('radio button index responder:',_value[0],', parent value:',this.parent.value);
+          this.parent.setValue( _value[0] );
+        }
       }
     }
   }),
@@ -141,8 +144,10 @@ HRadioButtonList = HListItemControl.extend({
       }
       for ( var i = 0; i < this.listItems.length; i++ ) {
         if ( this.listItems[i][0] === _value ) {
-          this.radioButtonResponder.setValue( -1 );
-          this.radioButtonResponder.setValue( i );
+          // if( this.radioButtonResponder.value !== i ){
+            this.radioButtonResponder.setValue( -1 );
+            this.radioButtonResponder.setValue( i );
+          // }
           break;
         }
       }

data/js/menus/minimenu/minimenu.js

@@ -18,6 +18,7 @@ HMiniMenu = HRadioButtonList.extend({
   
   defaultEvents: {
     draggable: true,
+    mouseUp: true,
     click: true,
     resize: true
   },
@@ -29,6 +30,7 @@ HMiniMenu = HRadioButtonList.extend({
   },
   
   repositionMenuItems: function(){
+    if(!this.listItems || (this.listItems && !this.listItems.length)){ return; }
     var
     x = this.pageX(),
     y = this.pageY(),
@@ -58,6 +60,7 @@ HMiniMenu = HRadioButtonList.extend({
   },
   
   click: function(){
+    if(!this.active){return false;}
     this.menuShow();
     return false;
   },
@@ -90,23 +93,26 @@ HMiniMenu = HRadioButtonList.extend({
   
   startDrag: function(x,y){
     this.dragStart = [x,y];
+    if(!this.active){return false;}
     this.menuShow();
     return false;
   },
   
   lostActiveStatus: function(_newActive){
-    // console.log('menu lost active status',_newActive);
-    if( !_newActive.isChildOf( this.menuItemView ) ){
+    if( _newActive && !_newActive.isChildOf( this.menuItemView ) ){
       this.menuHide();
     }
     this.base(_newActive);
   },
   
   gainedActiveStatus: function(_prevActive){
-    // console.log('menu gained active status',_prevActive);
+    if( _prevActive && _prevActive.isChildOf( this.menuItemView ) ){
+      this.menuHide();
+      // EVENT.changeActiveControl(null);
+    }
     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 +160,7 @@ HMiniMenu = HRadioButtonList.extend({
     this.valueMatrix = this.menuItemView.valueMatrix;
     this.refreshValue();
     if( this.options.initialVisibility ){
-      EVENT.changeActiveControl(this);
+      EVENT.changeActiveControl(null);
       this.menuShow();
     }
   },

data/js/menus/minimenuitem/minimenuitem.js

@@ -24,12 +24,14 @@ HMiniMenuItem = HRadioButton.extend({
   _activateParentParent: function(){
     var _parentParent = this.parent.options.logicParent;
     EVENT.changeActiveControl(_parentParent);
+    // EVENT.changeActiveControl(null);
+    // EVENT.blur( _this );
   },
 
-  // gainedActiveStatus: function( _prevActive ){
-  //   console.log('menuitem gained active status',_prevActive === this.parent.options.logicParent);
-  //   this.base( _prevActive );
-  // },
+  gainedActiveStatus: function( _prevActive ){
+    // console.log('menuitem gained active status',_prevActive === this.parent.options.logicParent);
+    this.base( _prevActive );
+  },
 
   lostActiveStatus: function( _newActive ){
     this.parent.options.logicParent.menuHide();

data/js/tables/table/table.coffee

@@ -0,0 +1,19 @@
+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 
+  refreshValue: ->
+    @_refreshTableContents() if @drawn and ( @value.constructor == Array )
+})
+

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

@@ -0,0 +1,19 @@
+<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>

data/lib/rsence/argv/initenv_argv.rb

@@ -157,7 +157,7 @@ module ArgvUtil
         say @strs[:initenv][:enter_http_port]
         str_http_port = @strs[:initenv][:http_port]
         config[:http_server][:port] = ask(str_http_port) do |q|
-          q.default = config[:http_server][:port]
+          q.default = config[:http_server][:port].to_s
         end
       
         say @strs[:initenv][:enter_tcp_ip]

data/lib/rsence/http/broker.rb

@@ -124,7 +124,9 @@ class Broker
       'mongrel'  => lambda { Rack::Handler::Mongrel  },
       'puma'     => lambda { Rack::Handler::Puma     }
     }[rack_require].call
-    handler.run( Rack::Lint.new(self.new), :Host => host, :Port => port )
+    handler.run( self.new, {
+      :Host => host, :Port => port
+    }.merge( conf[:handler_options] ) )
   end
   
   # Generic 404 error handler. Just sets up response status, headers, body as a small "Page Not Found" html page

data/lib/rsence/msg.rb

@@ -135,7 +135,7 @@ module RSence
       if options[:servlet]
         @do_gzip = false
       else
-        @response['Content-Type'] = 'text/javascript; charset=utf-8'
+        @response['Content-Type'] = 'application/json; charset=utf-8'
         @response['Cache-Control'] = 'no-cache'
       
         # gnu-zipped responses:

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