rsence-pre 3.0.0.10 → 3.0.0.11

data/client/js/media/mediaelement_defaults/mediaelement_defaults.coffee

@@ -0,0 +1 @@
+LOAD(-> mejs.MediaElementDefaults.pluginPath = HThemeManager.themePaths.mejs )

data/client/js/media/mediaelement_resources/mediaelement_resources.js

@@ -0,0 +1 @@
+// Dummy js, the real contents are in the themes directory

data/client/js/menus/combobox/combobox.coffee

@@ -37,14 +37,19 @@ HComboBoxInterface =
         @menuItemView.drawRect()
       drawSubviews: ->
         @base()
+        @destroyMarkupElem('label')
         @setMarkupOfPart('bg','▾')
         @setStyleOfPart('bg',
           lineHeight: (@rect.height+2)+'px'
           verticalAlign: 'middle'
           borderLeft: '1px solid #ccc'
+          position: 'absolute'
+          fontSize: '13px'
+          textAlign: 'center'
+          backgroundColor: '#f9f9f9'
         )
       @refreshValue()
-    ).new( [null,-1,14,@rect.height,0,null], @, _menuOptions )
+    ).new( [null,1,14,@rect.height-2,1,null], @, _menuOptions )
     @_extraLabelRight += 14
     if @unitSuffix
       ELEM.setStyle(@unitSuffix.elemId,'paddingRight','14px')

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

@@ -1,21 +1,18 @@
 .default.menuitem { cursor: pointer; }
-
 .default.menuitem:hover { background-color: #fff; }
-
 .default.menuitem.disabled { cursor: default; opacity: 0.8; }
-
 .default.menuitem > .label,
-.default.menuitem.state {
+.default.menuitem > .state {
   position: absolute; height: 24px;
 }
-.default.menuitem.state {
+.default.menuitem > .state {
   left: 4px; top: 7px; height: 12px; width: 12px;
-  background-image: #url(menuitem_checkmark.png);
+  background-image: #url(minimenuitem_checkmark.png);
 }
-.default.menuitem.state {
+.default.menuitem > .state {
   visibility: hidden;
 }
-.default.menuitem.state.checked {
+.default.menuitem.checked > .state{
   visibility: inherit;
 }
 .default.menuitem > .label {

data/client/js/menus/minimenu/minimenu.js

@@ -117,8 +117,8 @@ HMiniMenu = HRadioButtonList.extend({
       ELEM.setStyles( _menu._hideElemId, {
         position: 'absolute', left: 0, top: 0, right: 0, bottom: 0//, backgroundColor: '#000', opacity: 0.2
       } );
-      Event.observe( ELEM.get( _menu._hideElemId ), 'mousedown', function(e){_menu.menuHide();EVENT.mouseDown(e);return false;} );
-      ELEM.setStyle( _menu._hideElemId, 'z-index', ELEM.getStyle(_menu.menuItemView.elemId,'z-index')-1 );
+      Event.observe( ELEM.get( _menu._hideElemId ), 'mousedown', function(e){_menu.menuHide();_menu.pushTask(function(){EVENT.mouseDown(e);});return true;} );
+      ELEM.setStyle( _menu._hideElemId, 'zIndex', ELEM.getStyle(_menu.menuItemView.elemId,'z-index')-1 );
     } );
     this.menuItemView.show();
     return true;

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

@@ -1,9 +1,5 @@
-.default.minimenu {
-  cursor: pointer;
-}
-.default.minimenu.disabled {
-  cursor: default;
-}
+.default.minimenu { cursor: pointer; }
+.default.minimenu.disabled { cursor: default; }
 .default.minimenu > .bg,
 .default.minimenu > .bg > .w,
 .default.minimenu > .bg > .c,
@@ -12,37 +8,29 @@
   position: absolute;
   top: 0px; height: 15px;
 }
-
 .default.minimenu > .bg {
   left: 0px; right: 0px;
-  cursor: pointer;
-}
-.disabled .default.minimenu > .bg {
-  cursor: default;
 }
-
 .default.minimenu > .bg > .w,
 .default.minimenu > .bg > .c,
 .default.minimenu > .bg > .e {
   background-image: #url(minimenu.png);
 }
-
 .default.minimenu > .bg > .w {
   left: 0px; width: 7px;
   background-position: 0px 0px;
+  background-repeat: no-repeat;
 }
-
 .default.minimenu > .bg > .e {
   right: 0px; width: 13px;
   background-position: -7px 0px;
+  background-repeat: no-repeat;
 }
-
 .default.minimenu > .bg > .c {
   left: 7px; right: 13px;
   background-position: 0px -15px;
   background-repeat: repeat-x;
 }
-
 .default.minimenu > .label {
   left: 6px; right: 11px; top: 0px;
   height: 15px; line-height: 15px;
@@ -55,9 +43,5 @@
   font-size: 11px;
   color: #333;
 }
-.default.minimenu > .bg:hover > .default.minimenu > .label {
-  color: #000;
-}
-.disabled .default.minimenu > .bg {
-  opacity: 0.8;
-}
+.default.minimenu:hover > .label { color: #000; }
+.default.minimenu.disabled > .bg { opacity: 0.8; }

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

@@ -1,21 +1,18 @@
 .default.minimenuitem { cursor: pointer; }
-
 .default.minimenuitem:hover { background-color: #fff; }
-
 .default.minimenuitem.disabled { cursor: default; opacity: 0.8; }
-
 .default.minimenuitem > .label,
-.default.minimenuitem.state {
+.default.minimenuitem > .state {
   position: absolute; height: 16px;
 }
-.default.minimenuitem.state {
+.default.minimenuitem > .state {
   left: 0px; top: 1px; height: 12px; width: 12px;
-  background-image: #url(minimenuitemitem_checkmark.png);
+  background-image: #url(minimenuitem_checkmark.png);
 }
-.default.minimenuitem.state {
+.default.minimenuitem > .state {
   visibility: hidden;
 }
-.default.minimenuitem.state.checked {
+.default.minimenuitem.checked > .state {
   visibility: inherit;
 }
 .default.minimenuitem > .label {

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

@@ -1,9 +1,5 @@
-.default.popupmenu {
-  cursor: pointer;
-}
-.default.popupmenu.disabled {
-  cursor: default;
-}
+.default.popupmenu { cursor: pointer; }
+.default.popupmenu.disabled { cursor: default; }
 .default.popupmenu > .bg,
 .default.popupmenu > .bg > .w,
 .default.popupmenu > .bg > .c,
@@ -12,42 +8,32 @@
   position: absolute;
   top: 0px; height: 23px;
 }
-
 .default.popupmenu > .bg {
   left: 0px; right: 0px;
-  cursor: pointer;
-}
-.default.popupmenu > .disabled .bg {
-  cursor: default;
 }
-
 .default.popupmenu > .bg > .w,
 .default.popupmenu > .bg > .c,
 .default.popupmenu > .bg > .e {
   background-image: #url(popupmenu.png);
 }
-
 .default.popupmenu > .bg > .w {
   left: 0px; width: 9px;
   background-position: 0px 0px;
   background-repeat: no-repeat;
 }
-
 .default.popupmenu > .bg > .e {
   right: 0px; width: 17px;
   background-position: -9px 0px;
   background-repeat: no-repeat;
 }
-
 .default.popupmenu > .bg > .c {
   left: 9px; right: 17px;
   background-position: 0px -23px;
   background-repeat: repeat-x;
 }
-
 .default.popupmenu > .label {
   left: 13px; right: 11px; top: 0px;
-  height: 22px;
+  height: 22px; line-height: 22px;
   text-align: left;
   text-overflow: ellipsis;
   overflow: hidden;
@@ -56,14 +42,7 @@
   font-family: Helvetica, Arial, sans-serif;
   font-size: 12px;
   color: #333;
-  line-height: 22px;
-}
-.default.popupmenu.ie7 > .label{
-  line-height: 20px;
-}
-.default.popupmenu > .bg:hover > .label {
-  color: #000;
-}
-.default.popupmenu.disabled > .bg {
-  opacity: 0.6;
 }
+.default.popupmenu:hover > .label { color: #000; }
+.default.popupmenu.disabled > .bg { opacity: 0.8; }
+.default.popupmenu.ie7 > .label{ line-height: 20px; }

data/plugins/client_pkg/lib/client_pkg_build.rb

@@ -317,7 +317,11 @@ class ClientPkgBuild
         if @debug
           min_size = js_size
         else
-          js_data = @jsmin.minimize( js_data ) unless @no_whitespace_removal
+          begin
+            js_data = @jsmin.minimize( js_data ) unless @no_whitespace_removal
+          rescue => e
+            warn "JSMin failed for #{src_path} (#{e.inspect}); using uncompressed version."
+          end
           min_size = js_data.bytesize
         end
         if is_coffee

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsence-pre
 version: !ruby/object:Gem::Version
-  version: 3.0.0.10
+  version: 3.0.0.11
 platform: ruby
 authors:
 - Riassence Inc.
@@ -272,6 +272,13 @@ files:
 - client/js/lists/propertylist/propertylist.js
 - client/js/lists/propertylist/propertylisteditor/propertylisteditor.js
 - client/js/lists/radiobuttonlist/radiobuttonlist.js
+- client/js/media/mediaelement/mediaelement.js
+- client/js/media/mediaelement_defaults/mediaelement_defaults.coffee
+- client/js/media/mediaelement_resources/mediaelement_resources.js
+- client/js/media/mediaelement_resources/themes/mejs/flashmediaelement.swf
+- client/js/media/mediaelement_resources/themes/mejs/mediaelement_resources.css
+- client/js/media/mediaelement_resources/themes/mejs/mediaelement_resources.html
+- client/js/media/mediaelement_resources/themes/mejs/silverlightmediaelement.xap
 - client/js/menus/combobox/combobox.coffee
 - client/js/menus/menuitem/menuitem.js
 - client/js/menus/menuitem/themes/default/menuitem.css