rsence-pre 2.1.0.7.pre → 2.1.0.8.pre

data/js/foundation/view/view.js

@@ -552,7 +552,7 @@ HView = HClass.extend({
   * ++
   **/
   _setCSS: function(_additional){
-    var _cssStyle = 'display:none;overflow:hidden;visibility:hidden;';
+    var _cssStyle = 'overflow:hidden;visibility:hidden;';
     if(this.isAbsolute){
       _cssStyle += 'position:absolute;';
     } else {
@@ -568,20 +568,18 @@ HView = HClass.extend({
   * ++
   **/
   _getParentElemId: function(){
-    var _parentElemId;
-    // if the parent does not have an element:
-    if(this.parent.elemId === undefined) {
-      _parentElemId = 0;
-    }
-    // if a subview element is defined in the template, use it:
-    else if(this.parent.markupElemIds&&this.parent.markupElemIds['subview']){
-      _parentElemId = this.parent.markupElemIds['subview'];
+    var _parent = this.parent;
+    return ((_parent.elemId === undefined)?0:((_parent._getSubviewId===undefined)?0:_parent._getSubviewId()));
+  },
+  
+  _getSubviewId: function(){
+    if(this.markupElemIds&&this.markupElemIds.subview!==undefined){
+      return this.markupElemIds.subview;
     }
-    // otherwise, use main elemId
-    else {
-      _parentElemId = this.parent.elemId;
+    else if(this.elemId !== undefined) {
+      return this.elemId;
     }
-    return _parentElemId;
+    return 0;
   },
   
 /** --
@@ -616,30 +614,52 @@ HView = HClass.extend({
   *
   **/
   drawRect: function() {
+    if(!this.rect.isValid){
+      console.log('invalid rect:',ELEM.get(this.elemId));
+    }
+    if(!this.parent){
+      console.log('no parent:',ELEM.get(this.elemId));
+    }
     if (this.parent && this.rect.isValid) {
-      var _this = this,
-          _elemId = _this.elemId,
-          _styl = ELEM.setStyle,
-          _rect = _this.rect;
-    
-      _styl( _elemId, 'left', _this.flexLeft?(_rect.left+'px'):'auto', true);
-      _styl( _elemId, 'top', _this.flexTop?(_rect.top+'px'):'auto', true);
-      _styl( _elemId, 'right', _this.flexRight?(_this.flexRightOffset+'px'):'auto', true);
-      _styl( _elemId, 'bottom', _this.flexBottom?(_this.flexBottomOffset+'px'):'auto', true);
-      _styl( _elemId, 'width', (_this.flexLeft&&_this.flexRight)?'auto':(_rect.width+'px'), true);
-      _styl( _elemId, 'height', (_this.flexTop&&_this.flexBottom)?'auto':(_rect.height+'px'), true);
-      
+      var
+      i = 0,
+      _this = this,
+      _elemId = _this.elemId,
+      _styl = ELEM.setStyle,
+      _rect = _this.rect,
+      _auto = 'auto',
+      _left = _this.flexLeft?_rect.left:_auto,
+      _top  = _this.flexTop?_rect.top:_auto,
+      _right = _this.flexRight?_this.flexRightOffset:_auto,
+      _bottom = _this.flexBottom?_this.flexBottomOffset:_auto,
+      _width = (_this.flexLeft&&_this.flexRight)?_auto:_rect.width,
+      _height = (_this.flexTop&&_this.flexBottom)?_auto:_rect.height,
+      _styles = [
+        [ 'left',   _left   ],
+        [ 'top',    _top    ],
+        [ 'right',  _right  ],
+        [ 'bottom', _bottom ],
+        [ 'width',  _width  ],
+        [ 'height', _height ],
+        [ 'display', _this.displayMode ]
+      ],
+      _key, _value;
       // Show the rectangle once it gets created, unless visibility was set to
       // hidden in the constructor.
-      if(_this.isHidden === undefined || _this.isHidden === false) {
-        _styl( _elemId, 'visibility', 'inherit', true);
+      if(!_this.isHidden) {
+        _styles.push( [ 'visibility', 'inherit' ] );
+      }
+      for(;i<_styles.length;i++){
+        _key = _styles[i][0];
+        _value = _styles[i][1];
+        if( i < 6 && _value !== _auto ){
+          _value += 'px';
+        }
+        _styl(_elemId,_key,_value,true);
       }
-    
-      _styl( _elemId, 'display', _this.displayMode, true);
-    
       _this._updateZIndex();
-    
-      if (_this._cachedLeft !== _rect.left || _this._cachedTop !== _rect.top) {
+      
+      if ( _this._cachedLeft !== _rect.left || _this._cachedTop !== _rect.top) {
         _this.invalidatePositionCache();
         _this._cachedLeft = _rect.left;
         _this._cachedTop = _rect.top;
@@ -688,15 +708,7 @@ HView = HClass.extend({
       }
       this.drawSubviews();
       if(this.options.style){
-        var
-        _style = this.options.style,
-        _styleItem, _styleKey, _styleValue, i = 0;
-        for(;i<_style.length;i++){
-          _styleItem  = _style[i];
-          _styleKey   = _styleItem[0];
-          _styleValue = _styleItem[1];
-          this.setStyle(_styleKey,_styleValue);
-        }
+        this.setStyles( this.options.style );
       }
       if(this.options.html){
         this.setHTML(this.options.html);
@@ -866,17 +878,6 @@ HView = HClass.extend({
     return [ 0, 0, _parentSize[0], _parentSize[1] ];
   },
   
-  parentSize: function(){
-    var _parentElemId = this.parent.elemId;
-    if ( _parentElemId === 0 ) {
-      return ELEM.windowSize();
-    }
-    else {
-      ELEM.flushLoop();
-      return ELEM.getSize( _parentElemId );
-    }
-  },
-  
   minWidth: 0,
   setMinWidth: function(_minWidth){
     this.minWidth = _minWidth;
@@ -1007,7 +1008,19 @@ HView = HClass.extend({
     }
     return this;
   },
-
+  
+  setStyles: function(_styles){
+    var
+    _styleItem, _styleKey, _styleValue, i = 0;
+    for(;i<_styles.length;i++){
+      _styleItem  = _styles[i];
+      _styleKey   = _styleItem[0];
+      _styleValue = _styleItem[1];
+      this.setStyle(_styleKey,_styleValue);
+    }
+    return this;
+  },
+  
 /** = Description
   * Returns a style of the main DOM element of the component.
   * Utilizes +ELEM+ cache to perform the action.
@@ -1043,7 +1056,7 @@ HView = HClass.extend({
     if (!this['markupElemIds']){
       console.log('Warning, setStyleOfPart: no markupElemIds');
     }
-    else if (!this.markupElemIds[_partName]) {
+    else if (this.markupElemIds[_partName]===undefined) {
       console.log('Warning, setStyleOfPart: partName "'+_partName+'" does not exist for viewId '+this.viewId+'.');
     }
     else {
@@ -1065,7 +1078,7 @@ HView = HClass.extend({
   *
   **/
   styleOfPart: function(_partName, _name) {
-    if (!this.markupElemIds[_partName]) {
+    if (this.markupElemIds[_partName]===undefined) {
       console.log('Warning, styleOfPart: partName "'+_partName+'" does not exist for viewId '+this.viewId+'.');
       return '';
     }
@@ -1085,7 +1098,7 @@ HView = HClass.extend({
   *
   **/
   setMarkupOfPart: function( _partName, _value ) {
-    if (!this.markupElemIds[_partName]) {
+    if (this.markupElemIds[_partName]===undefined) {
       console.log('Warning, setMarkupOfPart: partName "'+_partName+'" does not exist for viewId '+this.viewId+'.');
     }
     else {
@@ -1106,7 +1119,7 @@ HView = HClass.extend({
   *
   **/
   markupOfPart: function(_partName) {
-    if (!this.markupElemIds[_partName]) {
+    if (this.markupElemIds[_partName]===undefined) {
       console.log('Warning, markupOfPart: partName "'+_partName+'" does not exist for viewId '+this.viewId+'.');
       return '';
     }
@@ -1628,7 +1641,7 @@ HView = HClass.extend({
     ELEM.setCSS(_stringElem, "visibility:hidden;"+_extraCss);
     ELEM.setHTML(_stringElem, _string);
     // ELEM.flushLoop();
-    var _visibleSize=ELEM.getVisibleSize(_stringElem);
+    var _visibleSize=ELEM.getSize(_stringElem);
     // console.log('visibleSize',_visibleSize);
     ELEM.del(_stringElem);
     return [_visibleSize[0]+_visibleSize[0]%2,_visibleSize[1]+_visibleSize[1]%2];
@@ -1649,20 +1662,13 @@ HView = HClass.extend({
 /** Returns the X coordinate that has the scrolled position calculated.
   **/
   pageX: function() {
-    var _x = 0,
-        _elem = this;
-    while(_elem) {
-      if(_elem.elemId && _elem.rect) {
-        _x += ELEM.get(_elem.elemId).offsetLeft;
-        _x -= ELEM.get(_elem.elemId).scrollLeft;
-      }
-      if(_elem.markupElemIds&&_elem.markupElemIds.subview){
-        _x += ELEM.get(_elem.markupElemIds.subview).offsetLeft;
-        _x -= ELEM.get(_elem.markupElemIds.subview).scrollLeft;
-      }
-      _elem = _elem.parent;
-    }
-    return _x;
+    return ELEM._getVisibleLeftPosition( this.elemId );
+  },
+  
+/** Returns the Y coordinate that has the scrolled position calculated.
+  **/
+  pageY: function() {
+    return ELEM._getVisibleTopPosition( this.elemId );
   },
   
 /** = Description
@@ -1712,25 +1718,6 @@ HView = HClass.extend({
     return this;
   },
   
-/** Returns the Y coordinate that has the scrolled position calculated.
-  **/
-  pageY: function() {
-    var _y = 0,
-        _elem = this;
-    while(_elem) {
-      if(_elem.elemId && _elem.rect) {
-        _y += ELEM.get(_elem.elemId).offsetTop;
-        _y -= ELEM.get(_elem.elemId).scrollTop;
-      }
-      if(_elem.markupElemIds&&_elem.markupElemIds.subview){
-        _y += ELEM.get(_elem.markupElemIds.subview).offsetTop;
-        _y -= ELEM.get(_elem.markupElemIds.subview).scrollTop;
-      }
-      _elem = _elem.parent;
-    }
-    return _y;
-  },
-  
 /** Returns the HPoint that has the scrolled position calculated.
   **/
   pageLocation: function() {

data/js/lists/propertylist/propertylist.js

@@ -21,13 +21,13 @@ HPropertyList = HControl.extend({
     click: true
   },
   
-  controlDefaults: (HControlDefaults.extend({
+  controlDefaults: HControlDefaults.extend({
     keyColumnWidth: 100,
     hideTypeColumn: false,
     useEditor: false,
     rowHeight: 15,
     keyIndent: 8
-  })),
+  }),
   
   click: function(x,y){
     if(this.options.useEditor){
@@ -91,10 +91,17 @@ HPropertyList = HControl.extend({
     this.separatortParentElemId = separatorParentElemId;
 
     this.propertyItems = [];
-    
     // Editor initialization
     if(this.options.useEditor){
-      this.editorValue = HValue.nu( false, [ 'test', 's', 'Test String' ] );
+      this.editorValue = HValue.nu(
+        false, {
+          top: 0,
+          left: 0,
+          type: 'h',
+          name: '--',
+          value: {}
+        }
+      );
       this.editor = HPropertyListEditor.nu(
         [0,0,null,this.options.rowHeight+2,0,null],
         this.contentView, {
@@ -495,7 +502,7 @@ HPropertyList = HControl.extend({
     }
     
     this.selectedItem = itemNum;
-    this.editorValue.set(this.valueTokens[itemNum]);
+    this.editorValue.set( COMM.Values.clone(this.valueTokens[itemNum]) );
     this.editor.show();
     EVENT.changeActiveControl(this.editor);
     this.editor.offsetTo( 0, targetY );

data/js/lists/propertylist/propertylisteditor/propertylisteditor.js

@@ -59,7 +59,9 @@ HPropertyListEditor = HControl.extend({
   
   lostActiveStatus: function(newActive){
     this.base();
-    if(newActive && ((newActive === this) || (newActive.parents.indexOf(this) !== -1)) ){
+    if( newActive &&
+      ( (newActive === this) || (newActive.parents.indexOf(this) !== -1) )
+    ){
       return;
     }
     this.hide();
@@ -111,12 +113,11 @@ HPropertyListEditor = HControl.extend({
     var
     parent = this.parent.parent,
     opts = parent.options;
-    
     this.nameEditor = HTextControl.extend({
       boldTypes: ['a','h'],
       lostActiveStatus: function(newActive){
-        this.parent.lostActiveStatus(newActive);
         this.base();
+        this.parent.lostActiveStatus(newActive);
       },
       refreshValue: function(){
         if(this.drawn){
@@ -141,7 +142,6 @@ HPropertyListEditor = HControl.extend({
     
     var
     height = this.nameEditor.rect.height;
-    
     if(!opts.hideTypeColumn){
       this.typeEditor = HMiniMenu.extend({
         lostActiveStatus: function(newActive){

data/js/menus/minimenu/minimenu.js

@@ -17,8 +17,7 @@ HMiniMenu = HRadioButtonList.extend({
   componentName: 'minimenu',
   
   defaultEvents: {
-    mouseDown: true,
-    mouseUp: true,
+    draggable: true,
     click: true
   },
   
@@ -52,7 +51,7 @@ HMiniMenu = HRadioButtonList.extend({
   },
   
   click: function(){
-    this.mouseDown();
+    this.menuShow();
   },
   
   refreshValue: function(){
@@ -60,22 +59,40 @@ HMiniMenu = HRadioButtonList.extend({
     for(var i=0;i<this.listItems.length;i++){
       if(this.listItems[i][0]===this.value){
         this.setLabel( this.listItems[i][1] );
-        break;
+        return;
       }
     }
   },
   
-  mouseDown: function(){
+  menuShow: function(){
     this.repositionMenuItems();
     this.menuItemView.bringToFront();
     this.menuItemView.show();
     return true;
   },
   
+  menuHide: function(){
+    this.menuItemView.sendToBack();
+    this.menuItemView.hide();
+  },
+  
+  startDrag: function(x,y){
+    this.dragStart = [x,y];
+    this.menuShow();
+  },
+  
   lostActiveStatus: function(newActive){
-    this.base(newActive);
-    if((newActive.parent !== this.menuItemView) && (newActive !== this.menuItemView)){
-      this.menuItemView.hide();
+    this.menuHide();
+  },
+  
+  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))
+    ){
+      this.menuShow();
+    }
+    else {
+      this.menuHide();
     }
   },
   
@@ -85,15 +102,21 @@ HMiniMenu = HRadioButtonList.extend({
   },
   
   drawSubviews: function(){
+    this.markupElemIds.subview = 0;
     this.menuItemView = HView.extend({
-      drawSubviews: function(){
-        this.setStyle( 'background-color','#f6f6f6' );
-        this.setStyle( 'border', '1px solid #999' );
+      bringToFront: function(){
+        this.setStyle('z-index',this.app.views.length);
       }
     }).nu(
       [ this.rect.left, this.rect.top, this.rect.width, 500 ],
-      this.app, {
-        visible: false
+      this, {
+        visible: false,
+        style: [
+          ['background-color','#f6f6f6'],
+          ['border', '1px solid #999'],
+          ['overflow-y', 'auto'],
+          ['opacity', 0.9]
+        ]
       }
     );
   },

data/js/menus/minimenu/minimenuitem/minimenuitem.js

@@ -22,7 +22,7 @@ HMiniMenuItem = HRadioButton.extend({
   
   click: function(){
     this.base();
-    this.parent.hide();
+    EVENT.changeActiveControl(this.parent.parent);
   },
   
   mouseUp: function(){

data/js/menus/minimenu/minimenuitem/themes/default/minimenuitem.css

@@ -37,7 +37,7 @@
   font-size: 11px;
   color: #333;
 }
-.minimenuitem_control:hover > .minimenuitem_label {
+.minimenuitem_label:hover {
   color: #000;
 }
 .disabled .minimenuitem_control {

data/lib/conf/argv.rb

@@ -19,6 +19,25 @@ module RSence
     return (not ['i386-mingw32','x86-mingw32'].include?(RUBY_PLATFORM))
   end
   
+  # @private  Returns true, if platform is linux
+  def self.linux?
+    return RUBY_PLATFORM.end_with?('-linux')
+  end
+  
+  # @private  Returns true, if platform is Mac OS X
+  def self.darwin?
+    return RUBY_PLATFORM.include?('-darwin')
+  end
+  
+  # @private  Returns signal name that resembles INFO or PWR (extra signal to poll for server status)
+  def self.info_signal_name
+    if self.linux?
+      return 'PWR'
+    else
+      return 'INFO'
+    end
+  end
+  
   # @private  ARGVParser is the "user interface" as a command-line argument parser.
   #           It parses the command-line arguments and sets up things accordingly.
   class ARGVParser
@@ -327,7 +346,8 @@ module RSence
       end
     end
     
-    # Main argument parser for the status command, sends the INFO POSIX signal to the process, if running.
+    # Main argument parser for the status command, sends the INFO (or PWR on linux) POSIX signal to
+    # the process, if running.
     # Checks if the process responds on the port and address it's configured for.
     def parse_status_argv
       init_args
@@ -406,8 +426,9 @@ module RSence
         pid_fn = config[:daemon][:pid_fn]
         if File.exists?( pid_fn )
           pid = File.read( pid_fn ).to_i
+          sig_name = RSence.info_signal_name
           pid_status = RSence::SIGComm.wait_signal_response(
-            pid, pid_fn, 'INFO', 3
+            pid, pid_fn, sig_name, 3
           )
         else
           warn @@strs[:messages][:no_pid_file] if @args[:verbose]

data/lib/daemon/daemon.rb

@@ -47,7 +47,7 @@ module RSence
     end
   
     def self.responds?( daemon )
-      wait_signal_response( daemon, 'INFO' )
+      wait_signal_response( daemon, RSence.info_signal_name )
     end
   
     # Reads the pid file and calls the process.
@@ -123,9 +123,9 @@ module RSence
         daemon.alrm
         write_signal_response( daemon, 'ALRM' )
       end
-      Signal.trap( 'INFO' ) do 
+      Signal.trap( RSence.info_signal_name ) do 
         daemon.info
-        write_signal_response( daemon, 'INFO' )
+        write_signal_response( daemon, RSence.info_signal_name )
       end
       ['INT', 'TERM', 'KILL'].each do | signal |
         Signal.trap( signal ) do
@@ -355,7 +355,7 @@ module RSence
     #   save
     # end
     
-    # Called on INFO signals ("Alive?")
+    # Called on INFO (PWR) signals ("Alive?")
     def info
       puts "#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} -- RSence version #{RSence.version} is running."
     end

data/lib/plugins/pluginmanager.rb

@@ -253,9 +253,10 @@ module RSence
       end
       if is_dir
         Dir.entries( bundle_path ).each do |entry_name|
-          next if entry_name[0].chr == '.'
+          next if entry_name[0].chr == '.' # skip hidden, '.' and '..' 
           full_path = File.join( bundle_path, entry_name )
           unless File.directory?( full_path )
+            next if entry_name == 'plugins' # skip sub-plugins
             has_dot = entry_name.include?('.')
             next unless has_dot
             is_src_file = ['yaml','rb'].include?( entry_name.split('.')[-1] )

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rsence-pre
 version: !ruby/object:Gem::Version 
-  hash: 961916152
+  hash: 961916100
   prerelease: true
   segments: 
   - 2
   - 1
   - 0
-  - 7
+  - 8
   - pre
-  version: 2.1.0.7.pre
+  version: 2.1.0.8.pre
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 +03:00
+date: 2010-09-12 00:00:00 +03:00
 default_executable: rsence-pre
 dependencies: 
 - !ruby/object:Gem::Dependency