rsence-pre 2.2.0.7 → 2.2.0.8

data/VERSION

@@ -1 +1 @@
-2.2.0.7.pre
+2.2.0.8.pre

data/conf/default_conf.yaml

@@ -202,7 +202,7 @@
 
       # The core package, loaded by default using a script tag in index_html
       core:
-  
+        
         # RSence.*
         - rsence_ns
         
@@ -212,15 +212,15 @@
         - class             # HClass
         - elem              # ELEM
         - event             # Event
-  
+        
         # RSence.Util
         - sha               # SHA
-  
+        
         # RSence.Foundation
         - system            # HSystem
         - valueresponder    # HValueResponder
         - application       # HApplication
-  
+        
         # COMM
         - comm              # COMM
         - queue             # COMM.Queue
@@ -305,6 +305,8 @@
         - propertylisteditor  # HPropertyEditor
         - minimenu            # HMiniMenu
         - minimenuitem        # HMiniMenuItem
+        - popupmenu           # HPopupMenu
+        - menuitem            # HMenuItem
       
       # Graphics related control widgets (components)
       # These are not complete and there will probably never be any

data/js/controls/button/themes/default/button.css

@@ -68,7 +68,7 @@
 
 .button_label {
   left: 6px; right: 6px; top: 2px;
-  height: 20px; line-height: 21px;
+  height: 20px; line-height: 20px;
   text-align: center; vertical-align: middle;
   font-family: Arial, sans-serif;
   font-size: 12px; font-weight: bold;

data/js/controls/checkbox/themes/default/checkbox.css

@@ -47,7 +47,7 @@
 
 .checkbox_label {
   left: 24px; right: 0px; top: 2px;
-  height: 20px; line-height: 21px;
+  height: 20px; line-height: 22px;
   text-align: left; vertical-align: middle;
   font-family: Arial, sans-serif;
   font-size: 12px;

data/js/controls/radiobutton/themes/default/radiobutton.css

@@ -47,7 +47,7 @@
 
 .radiobutton_label {
   left: 24px; right: 0px; top: 0px;
-  height: 20px; line-height: 21px;
+  height: 20px; line-height: 24px;
   text-align: left; vertical-align: middle;
   font-family: Arial, sans-serif;
   font-size: 12px;

data/js/controls/window/themes/default/window.css

@@ -148,7 +148,7 @@
 
 .window_label {
   left: 0px; top: 0px; right: 0px; height: 24px;
-  line-height: 25px;
+  line-height: 26px;
   text-align: center;
   vertical-align: middle;
   font-family: Arial, sans-serif;

data/js/core/elem/elem.js

@@ -52,7 +52,10 @@ BROWSER_TYPE = {
   firefox2: false,
 
 /* Mozilla Firefox version 3 */
-  firefox3: false
+  firefox3: false,
+
+/* Mozilla Firefox version 4 */
+  firefox4: false
 };
 
 /** = Description
@@ -1239,6 +1242,7 @@ ELEM = {
     _browserType.firefox  = _ua.indexOf("Firefox") !== -1;
     _browserType.firefox2 = _ua.indexOf("Firefox/2.") !== -1;
     _browserType.firefox3 = _ua.indexOf("Firefox/3.") !== -1;
+    _browserType.firefox4 = _ua.indexOf("Firefox/4.") !== -1;
     _this._domWaiter();
   },
   

data/js/datetime/calendar/themes/default/calendar.css

@@ -12,7 +12,6 @@
   position: absolute;
   top: 2px; width: 16px; height: 16px;
   font-size: 0; line-height: 0;
-  line-height: 20px;
   cursor: pointer;
   background-image: #{this.getCssFilePath('calendar_arrows.png')};
 }
@@ -55,7 +54,7 @@
   color: #000;
   font-family: Arial, sans-serif;
   font-size: 11px;
-  line-height: 15px;
+  line-height: 16px;
   vertical-align: middle;
   text-align: center;
 }

data/js/menus/menuitem/menuitem.js

@@ -0,0 +1,5 @@
+
+var
+HMenuItem = HMiniMenuItem.extend({
+  componentName: 'menuitem'
+});

data/js/menus/menuitem/themes/default/menuitem.css

@@ -0,0 +1,45 @@
+
+.menuitem_control,
+.menuitem_label,
+.menuitem_state {
+  position: absolute;
+  top: 0px; height: 24px;
+}
+
+.menuitem_control {
+  left: 0px; right: 0px;
+  cursor: pointer;
+}
+.menuitem_control:hover {
+  background-color: #fff;
+}
+
+.menuitem_state {
+  left: 4px; top: 7px; height: 12px; width: 12px;
+  background-image: #{this.getCssFilePath('minimenuitem_checkmark.png')};
+}
+.checked .menuitem_state {
+  visibility: inherit;
+}
+.unchecked .menuitem_state {
+  visibility: hidden;
+}
+
+.menuitem_label {
+  left: 20px; right: 11px; top: 0px;
+  height: 24px; line-height: 24px;
+  text-align: left;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space:nowrap;
+  vertical-align: middle;
+  font-family: Arial, sans-serif;
+  font-size: 12px;
+  color: #333;
+}
+.menuitem_label:hover {
+  color: #000;
+}
+.disabled .menuitem_control {
+  opacity: 0.8;
+}

data/js/menus/menuitem/themes/default/menuitem.html

@@ -0,0 +1,4 @@
+<div class="menuitem_control#{this.value?' checked':' unchecked'}" id="control#{_ID}">
+  <div class="menuitem_state" id="state#{_ID}"></div>
+  <div class="menuitem_label" id="label#{_ID}">#{this.label}</div>
+</div>

data/js/menus/minimenu/minimenu.js

@@ -20,13 +20,15 @@ HMiniMenu = HRadioButtonList.extend({
     draggable: true,
     click: true
   },
+
+  subCompenentHeight: 15,
   
   repositionMenuItems: function(){
     var
     x = this.pageX(),
     y = this.pageY(),
     w = this.rect.width,
-    h = this.listItems.length*15,
+    h = this.listItems.length*this.subComponentHeight,
     i = 0,
     listItem = null;
     for(;i<this.listItems.length && listItem === null;i++){
@@ -34,9 +36,9 @@ HMiniMenu = HRadioButtonList.extend({
         listItem = this.listItems[i];
       }
     }
-    y -= (i-1)*15;
+    y -= (i-1)*this.subComponentHeight;
     if(y < 0){
-      y = y%15;
+      y = y%this.subComponentHeight;
     }
     if(this.options['menuItemGeom']){
       if(this.options.menuItemGeom.width){
@@ -128,7 +130,7 @@ HMiniMenu = HRadioButtonList.extend({
   
   createComponent: function( i, _label ){
     return HMiniMenuItem.nu(
-      [ 0, (i*15), null, 15, 0, null ],
+      [ 0, (i*this.subComponentHeight), null, this.subComponentHeight, 0, null ],
       this.menuItemView, {
         label: _label
       }

data/js/menus/{minimenu/minimenuitem → minimenuitem}/themes/default/minimenuitem.css

@@ -3,7 +3,7 @@
 .minimenuitem_label,
 .minimenuitem_state {
   position: absolute;
-  top: 0px; height: 15px;
+  top: 0px; height: 16px;
 }
 
 .minimenuitem_control {
@@ -27,7 +27,7 @@
 
 .minimenuitem_label {
   left: 14px; right: 11px; top: 0px;
-  height: 15px; line-height: 15px;
+  height: 15px; line-height: 14px;
   text-align: left;
   text-overflow: ellipsis;
   overflow: hidden;

data/js/menus/popupmenu/popupmenu.js

@@ -0,0 +1,14 @@
+var
+HPopupMenu = HMiniMenu.extend({
+  componentName: 'popupmenu',
+  subComponentHeight: 24,
+  createComponent: function( i, _label ){
+    return HMenuItem.nu(
+      [ 0, (i*24), null, 24, 0, null ],
+      this.menuItemView, {
+        label: _label
+      }
+    );
+  }
+});
+var HPopUpMenu = HPopupMenu;

data/js/menus/popupmenu/themes/default/popupmenu.css

@@ -0,0 +1,65 @@
+
+.popupmenu_control,
+.popupmenu_edge_left,
+.popupmenu_center,
+.popupmenu_edge_right,
+.popupmenu_label,
+.popupmenu_antiselect {
+  position: absolute;
+  top: 0px; height: 23px;
+}
+
+.popupmenu_control {
+  left: 0px; right: 0px;
+  cursor: pointer;
+}
+.disabled .popupmenu_control {
+  cursor: default;
+}
+
+.popupmenu_edge_left,
+.popupmenu_center,
+.popupmenu_edge_right {
+  background-image: #{this.getCssFilePath('popupmenu.png')};
+}
+
+.popupmenu_edge_left {
+  left: 0px; width: 9px;
+  background-position: 0px 0px;
+  background-repeat: no-repeat;
+}
+
+.popupmenu_edge_right {
+  right: 0px; width: 17px;
+  background-position: -9px 0px;
+  background-repeat: no-repeat;
+}
+
+.popupmenu_center {
+  left: 9px; right: 17px;
+  background-position: 0px -23px;
+  background-repeat: repeat-x;
+}
+
+.popupmenu_label {
+  left: 13px; right: 11px; top: 0px;
+  height: 22px; line-height: 22px;
+  text-align: left;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space:nowrap;
+  vertical-align: middle;
+  font-family: Arial, sans-serif;
+  font-size: 12px;
+  color: #333;
+}
+.popupmenu_control:hover > .popupmenu_label {
+  color: #000;
+}
+.disabled .popupmenu_control {
+  opacity: 0.8;
+}
+
+.popupmenu_antiselect {
+  left: 0px; right: 0px;
+}

data/js/menus/popupmenu/themes/default/popupmenu.html

@@ -0,0 +1,7 @@
+<div class="popupmenu_control" id="control#{_ID}">
+  <div class="popupmenu_edge_left"></div>
+  <div class="popupmenu_center"></div>
+  <div class="popupmenu_edge_right"></div>
+  <div class="popupmenu_label" id="label#{_ID}">#{this.label}</div>
+  <div class="popupmenu_antiselect"></div>
+</div>

data/js/util/reloadapp/reloadapp.js

@@ -101,7 +101,7 @@ ReloadApp = HApplication.extend({
         ELEM.setCSS(_alertIcon,'position:absolute;left:8px;top:8px;width:48px;height:48px;background-image:url('+_iconUrl+');');
         ELEM.setCSS(_alertTitle,'position:absolute;left:64px;top:8px;width:300px;height:24px;line-height:24px;vertical-align:middle;text-align:center;font-weight:bold;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;');
         ELEM.setHTML(_alertTitle,_this.app._title);
-        ELEM.setCSS(_alertMessage,'position:absolute;left:64px;top:42px;width:332px;height:186px;border-bottom:1px dotted #999;line-height:17px;vertical-align:middle;overflow:auto;');
+        ELEM.setCSS(_alertMessage,'position:absolute;left:64px;top:42px;width:332px;height:186px;border-bottom:1px dotted #999;line-height:18px;vertical-align:middle;overflow:auto;');
         ELEM.setHTML(_alertMessage,_this.app._message);
         HButton.extend({
           click: this.app.reload

data/lib/http/broker.rb

@@ -104,6 +104,7 @@ class Broker
     
     # Selects the handler for Rack
     handler = {
+      'mongrel2' => lambda { Rack::Handler::Mongrel2 },
       'webrick'  => lambda { Rack::Handler::WEBrick  },
       'ebb'      => lambda { Rack::Handler::Ebb      },
       'thin'     => lambda { Rack::Handler::Thin     },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rsence-pre
 version: !ruby/object:Gem::Version 
-  hash: 113
+  hash: 111
   prerelease: 
   segments: 
   - 2
   - 2
   - 0
-  - 7
-  version: 2.2.0.7
+  - 8
+  version: 2.2.0.8
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 Z
+date: 2011-06-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rsence-deps
@@ -288,14 +288,21 @@ files:
 - js/lists/propertylist/propertylist.js
 - js/lists/propertylist/propertylisteditor/propertylisteditor.js
 - js/lists/radiobuttonlist/radiobuttonlist.js
+- js/menus/menuitem/menuitem.js
+- js/menus/menuitem/themes/default/menuitem.css
+- js/menus/menuitem/themes/default/menuitem.html
 - js/menus/minimenu/minimenu.js
-- js/menus/minimenu/minimenuitem/minimenuitem.js
-- js/menus/minimenu/minimenuitem/themes/default/minimenuitem.css
-- js/menus/minimenu/minimenuitem/themes/default/minimenuitem.html
-- js/menus/minimenu/minimenuitem/themes/default/minimenuitem_checkmark.png
 - js/menus/minimenu/themes/default/minimenu.css
 - js/menus/minimenu/themes/default/minimenu.html
 - js/menus/minimenu/themes/default/minimenu.png
+- js/menus/minimenuitem/minimenuitem.js
+- js/menus/minimenuitem/themes/default/minimenuitem.css
+- js/menus/minimenuitem/themes/default/minimenuitem.html
+- js/menus/minimenuitem/themes/default/minimenuitem_checkmark.png
+- js/menus/popupmenu/popupmenu.js
+- js/menus/popupmenu/themes/default/popupmenu.css
+- js/menus/popupmenu/themes/default/popupmenu.html
+- js/menus/popupmenu/themes/default/popupmenu.png
 - js/util/reloadapp/reloadapp.js
 - js/util/reloadapp/themes/default/reloadapp_warning-ie6.gif
 - js/util/reloadapp/themes/default/reloadapp_warning.png