rsence-pre 3.0.0.9 → 3.0.0.10

data/client/js/core/event/event.js

@@ -89,6 +89,9 @@ Event = {
   **/
   observe: function(_elem, _name, _function, _useCapture) {
     _useCapture = _useCapture || false;
+    if( typeof _elem === 'number' ){
+      _elem = ELEM.get(_elem);
+    }
     Event._observeAndCache(_elem, _name, _function, _useCapture);
     return _function;
   },
@@ -97,6 +100,9 @@ Event = {
   * removes the callback function.
   **/
   stopObserving: function(_elem, _name, _function, _useCapture) {
+    if( typeof _elem === 'number' ){
+      _elem = ELEM.get(_elem);
+    }
     if (_elem === undefined) {
       console.log('Warning Event.stopObserving of event name: "' + _name + '" called with an undefined elem!');
       return;

data/client/js/datetime/datepicker/datepicker.coffee

@@ -50,15 +50,19 @@ HDatePicker = HTextControl.extend
       _date.seconds( _seconds )
   fieldToValue: (_value)->
     _date = @moment(_value,@options.fieldFormat)
-    return @value unless _date.isValid()
+    if _date.isValid()
+      @setValid(true)
+    else
+      @setValid(false)
+      return @value
     @_dateRestore(_date)
     _date.unix()
   refreshValue: ->
     @base()
     @calendar.setValue(@value) if @calendar?
-    @setStyleOfPart('value','textAlign','right')
   drawSubviews: ->
-    @base()
+    @setStyleOfPart('value','textAlign','right')
+    # @base()
     if @options.calendarPicker
       @setStyleOfPart('label','right','26px')
       @calendar = HCalendarPulldown.extend(

data/client/js/foundation/eventmanager/eventmanager.coffee

@@ -775,6 +775,7 @@ EventManagerApp = HApplication.extend
   #
   # Sets the active control
   changeActiveControl: (_ctrl)->
+    return if _ctrl != null and @_views[@_listeners.active[0]] == _ctrl
     _prevActive = @delActiveControl(_ctrl)
     @addActiveControl(_ctrl, _prevActive) if _ctrl != null
   #
@@ -1123,13 +1124,17 @@ EventManagerApp = HApplication.extend
   # that responds true to _methodName. If _ctrl is undefined, use
   # a special default rule of auto-selecting the active control and
   # checking all of its siblings before traversing.
-  defaultKey: (_methodName,_ctrl)->
+  defaultKey: (_methodName,_ctrl,_testedIds)->
     return true if _ctrl? and _ctrl[_methodName]? and _ctrl[_methodName]() == true
     return null unless @_listeners.active
-    _ctrl = @_views[@_listeners.active[0]]
+    _ctrl = @_views[@_listeners.active[0]] unless _ctrl?
+    _ctrlId = _ctrl.viewId
+    return null if ~_testedIds.indexOf(_ctrlId)
     return true if _ctrl[_methodName]? and _ctrl[_methodName]() == true
     _stop = null
+    _testedIds.push(_ctrlId)
     for _viewId in _ctrl.parent.views
+      continue if ~_testedIds.indexOf(_viewId)
       continue if _ctrl.viewId == _viewId
       _ctrl = @_views[_viewId]
       if _ctrl[_methodName]?
@@ -1137,7 +1142,7 @@ EventManagerApp = HApplication.extend
         if _stopStatus == false or _stopStatus == true
           _stop = _stopStatus unless _stop
       return _stop if _stop != null
-    return true if _ctrl.parent? and @defaultKey(_methodName,_ctrl.parent) == true
+    return true if _ctrl.parent? and @defaultKey(_methodName,_ctrl.parent,_testedIds) == true
     null
   #
   # Handles the keyDown event
@@ -1168,7 +1173,7 @@ EventManagerApp = HApplication.extend
     # to instances of HControl, but any parent object will work.
     if not _repeating and @_defaultKeyActions[_keyCode.toString()]
       _defaultKeyMethod = @_defaultKeyActions[_keyCode.toString()]
-      _stop = true if @defaultKey(_defaultKeyMethod)
+      _stop = true if @defaultKey(_defaultKeyMethod,null,[])
     @_lastKeyDown = _keyCode
     Event.stop(e) if _stop
   keyUp: (e)->

data/client/js/foundation/thememanager/thememanager.coffee

@@ -141,11 +141,18 @@ HThemeManager = HClass.extend
       return ''
     return '' unless @themeCSSTemplates[_themeName][_componentName]?
     [_tmplJS, _tmplCSS] = @themeCSSTemplates[_themeName][_componentName]
-    return _tmplCSS if _tmplJS.length == 0
     [_variableMatch, _assignmentMatch] = [@_variableMatch, @_assignmentMatch]
     @getThemeGfxFile = (_fileName)-> @_buildThemePath(_fileName,_themeName)
     @getCssFilePath = (_fileName)->
       "url(#{@_buildThemePath(_fileName,_themeName)})"
+    _cssThemeUrlMatch = /#url\((.+?)\)/gm
+    # while _cssThemeUrlMatch.test(_tmplCSS)
+    if _cssThemeUrlMatch.test(_tmplCSS)
+      _tmplCSS = _tmplCSS.replace(
+        _cssThemeUrlMatch, (_match,_fileName)=>
+          "url(#{@_buildThemePath(_fileName,_themeName)})"
+      )
+    return _tmplCSS if _tmplJS.length == 0
     _callValue = (_id,_isAssign)->
       _oid = _id
       _id = parseInt(_id,36)-10

data/client/js/foundation/view/view.js

@@ -601,16 +601,23 @@ HView = UtilMethods.extend({
       if(this.isAbsolute){   ELEM.setStyle(this.elemId,'position','absolute'); }
       else {                 ELEM.setStyle(this.elemId,'position','relative'); }
 
-      // Theme name == CSS class name
+      // Theme name => CSS class name
       if(this.preserveTheme){
         ELEM.addClassName( this.elemId, this.theme );
       }
       else {
         ELEM.addClassName( this.elemId, HThemeManager.currentTheme );
       }
+      // componentName => CSS class name
       if( this.componentName !== undefined ){
         ELEM.addClassName( this.elemId, this.componentName );
       }
+      // BROWSER_TYPE.* = true => CSS class names
+      for( var _browserName in BROWSER_TYPE ){
+        if( BROWSER_TYPE[_browserName] === true ){
+          ELEM.addClassName( this.elemId, _browserName );
+        }
+      }
       if( this.options.textSelectable !== undefined ){
         this.textSelectable = this.options.textSelectable;
       }
@@ -674,10 +681,10 @@ HView = UtilMethods.extend({
         _this._updateZIndex();
       }
 
-      _this.drawn = true;
       if( _this.themeStyle !== undefined ){
         _this.themeStyle.call(_this);
       }
+      _this.drawn = true;
     }
     return this;
   },
@@ -1964,22 +1971,30 @@ HView = UtilMethods.extend({
   * The width in pixels required to draw a string in the font.
   *
   **/
+  _stringSizeImportantAttrs: ['fontSize','fontWeight','fontFamily','lineHeight'],
   stringSize: function(_string, _length, _elemId, _wrap, _customStyle) {
     if(!_customStyle){_customStyle = {};}
     if(this.typeChr(_customStyle) === 's'){
-      console.warn("#stringSize: use styles instead of css text!");
+      console.warn("#stringSize: use style objects instead of css text!");
       _customStyle = {};
     }
     if (_length || _length === 0) {
       _string = _string.substring(0, _length);
     }
     if (!_elemId && _elemId !== 0) {
-      _elemId = 0;
+      _elemId = this.elemId || 0;
     }
     _customStyle.visibility = 'hidden';
     if (!_wrap){
       _customStyle.whiteSpace = 'nowrap';
     }
+    var i=0,_attr;
+    for(;i<this._stringSizeImportantAttrs.length;i++){
+      _attr = this._stringSizeImportantAttrs[i];
+      if (!_customStyle[_attr]){
+        _customStyle[_attr] = ELEM.getStyle(_elemId,_attr);
+      }
+    }
     var
     _stringParent = ELEM.make(_elemId,'div'),
     _stringElem = ELEM.make(_stringParent,'span');

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

@@ -51,5 +51,5 @@ HComboBoxInterface =
       @unitSuffix.drawRect()
     @setStyleOfPart('label','right',this._extraLabelRight+'px')
     @menu.bringToFront()
-HComboBox = HTextControl.extend(HComboBoxInterface)
-HNumericComboBox = HNumericTextControl.extend(HComboBoxInterface)
+HComboBox = HTextControl.extend(HComboBoxInterface).extend({_comboNumber:false})
+HNumericComboBox = HNumericTextControl.extend(HComboBoxInterface).extend({_comboNumber:true})

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

@@ -1,31 +1,24 @@
+.default.menuitem { cursor: pointer; }
 
-.menuitem_control,
-.menuitem_label,
-.menuitem_state {
-  position: absolute;
-  top: 0px; height: 24px;
-}
+.default.menuitem:hover { background-color: #fff; }
 
-.menuitem_control {
-  left: 0px; right: 0px;
-  cursor: pointer;
-}
-.menuitem_control:hover {
-  background-color: #fff;
-}
+.default.menuitem.disabled { cursor: default; opacity: 0.8; }
 
-.menuitem_state {
-  left: 4px; top: 7px; height: 12px; width: 12px;
-  background-image: #{this.getCssFilePath('minimenuitem_checkmark.png')};
+.default.menuitem > .label,
+.default.menuitem.state {
+  position: absolute; height: 24px;
 }
-.checked .menuitem_state {
-  visibility: inherit;
+.default.menuitem.state {
+  left: 4px; top: 7px; height: 12px; width: 12px;
+  background-image: #url(menuitem_checkmark.png);
 }
-.unchecked .menuitem_state {
+.default.menuitem.state {
   visibility: hidden;
 }
-
-.menuitem_label {
+.default.menuitem.state.checked {
+  visibility: inherit;
+}
+.default.menuitem > .label {
   left: 20px; right: 11px; top: 0px;
   height: 24px; line-height: 24px;
   text-align: left;
@@ -37,9 +30,4 @@
   font-size: 12px;
   color: #333;
 }
-.menuitem_label:hover {
-  color: #000;
-}
-.disabled .menuitem_control {
-  opacity: 0.8;
-}
+.default.menuitem:hover > .label { color: #000; }

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

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

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

@@ -81,9 +81,17 @@ HMiniMenu = HRadioButtonList.extend({
     this.base();
     if(this.listItems && this.listItems.length !== 0 && this.valueMatrix !== undefined ) {
       for(var i=0;i<this.listItems.length;i++){
-        if(this.listItems[i][0]===this.value){
-          this.setLabel( this.listItems[i][1] );
-          return;
+        if(this.typeChr(this.listItems[i]) === 'a'){
+          if(this.listItems[i][0]===this.value){
+            this.setLabel( this.listItems[i][1] );
+            return;
+          }
+        }
+        else {
+          if(this.listItems[i].value===this.value){
+            this.setLabel( this.listItems[i].value );
+            return;
+          }
         }
       }
     }

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

@@ -1,44 +1,49 @@
-
-.minimenu_control,
-.minimenu_edge_left,
-.minimenu_center,
-.minimenu_edge_right,
-.minimenu_label {
+.default.minimenu {
+  cursor: pointer;
+}
+.default.minimenu.disabled {
+  cursor: default;
+}
+.default.minimenu > .bg,
+.default.minimenu > .bg > .w,
+.default.minimenu > .bg > .c,
+.default.minimenu > .bg > .e,
+.default.minimenu > .label {
   position: absolute;
   top: 0px; height: 15px;
 }
 
-.minimenu_control {
+.default.minimenu > .bg {
   left: 0px; right: 0px;
   cursor: pointer;
 }
-.disabled .minimenu_control {
+.disabled .default.minimenu > .bg {
   cursor: default;
 }
 
-.minimenu_edge_left,
-.minimenu_center,
-.minimenu_edge_right {
-  background-image: #{this.getCssFilePath('minimenu.png')};
+.default.minimenu > .bg > .w,
+.default.minimenu > .bg > .c,
+.default.minimenu > .bg > .e {
+  background-image: #url(minimenu.png);
 }
 
-.minimenu_edge_left {
+.default.minimenu > .bg > .w {
   left: 0px; width: 7px;
   background-position: 0px 0px;
 }
 
-.minimenu_edge_right {
+.default.minimenu > .bg > .e {
   right: 0px; width: 13px;
   background-position: -7px 0px;
 }
 
-.minimenu_center {
+.default.minimenu > .bg > .c {
   left: 7px; right: 13px;
   background-position: 0px -15px;
   background-repeat: repeat-x;
 }
 
-.minimenu_label {
+.default.minimenu > .label {
   left: 6px; right: 11px; top: 0px;
   height: 15px; line-height: 15px;
   text-align: left;
@@ -50,9 +55,9 @@
   font-size: 11px;
   color: #333;
 }
-.minimenu_control:hover > .minimenu_label {
+.default.minimenu > .bg:hover > .default.minimenu > .label {
   color: #000;
 }
-.disabled .minimenu_control {
+.disabled .default.minimenu > .bg {
   opacity: 0.8;
 }

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

@@ -1,8 +1,6 @@
-<div class="minimenu_control" id="control]I[">
-  <span id="bg]I[">
-    <div class="minimenu_edge_left"></div>
-    <div class="minimenu_center"></div>
-    <div class="minimenu_edge_right"></div>
-  </span>
-  <div class="minimenu_label" id="label]I[">#{this.label}</div>
-</div>
+<span class="bg" id="bg]I[">
+  <div class="w"></div>
+  <div class="c"></div>
+  <div class="e"></div>
+</span>
+<div class="label" id="label]I[">#{this.label}</div>

data/client/js/menus/minimenuitem/minimenuitem.js

@@ -26,8 +26,8 @@ HMiniMenuItem = HRadioButton.extend({
   click: function(){
     var _now = this.msNow();
     if( _now - this._parentLastActivation > 200 ){
-      this.base();
       this._parentLastActivation = _now;
+      this.base();
       EVENT.changeActiveControl(null);
     }
     return true;

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

@@ -1,31 +1,24 @@
+.default.minimenuitem { cursor: pointer; }
 
-.minimenuitem_control,
-.minimenuitem_label,
-.minimenuitem_state {
-  position: absolute;
-  top: 0px; height: 16px;
-}
+.default.minimenuitem:hover { background-color: #fff; }
 
-.minimenuitem_control {
-  left: 0px; right: 0px;
-  cursor: pointer;
-}
-.minimenuitem_control:hover {
-  background-color: #fff;
-}
+.default.minimenuitem.disabled { cursor: default; opacity: 0.8; }
 
-.minimenuitem_state {
-  left: 0px; top: 1px; height: 12px; width: 12px;
-  background-image: #{this.getCssFilePath('minimenuitem_checkmark.png')};
+.default.minimenuitem > .label,
+.default.minimenuitem.state {
+  position: absolute; height: 16px;
 }
-.checked .minimenuitem_state {
-  visibility: inherit;
+.default.minimenuitem.state {
+  left: 0px; top: 1px; height: 12px; width: 12px;
+  background-image: #url(minimenuitemitem_checkmark.png);
 }
-.unchecked .minimenuitem_state {
+.default.minimenuitem.state {
   visibility: hidden;
 }
-
-.minimenuitem_label {
+.default.minimenuitem.state.checked {
+  visibility: inherit;
+}
+.default.minimenuitem > .label {
   left: 14px; right: 11px; top: 0px;
   height: 15px; line-height: 14px;
   text-align: left;
@@ -37,9 +30,4 @@
   font-size: 11px;
   color: #333;
 }
-.minimenuitem_label:hover {
-  color: #000;
-}
-.disabled .minimenuitem_control {
-  opacity: 0.8;
-}
+.default.minimenuitem:hover > .label { color: #000; }

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

@@ -1,4 +1,2 @@
-<div class="minimenuitem_control#{this.value?' checked':' unchecked'}" id="control]I[">
-  <div class="minimenuitem_state" id="state]I["></div>
-  <div class="minimenuitem_label" id="label]I[">#{this.label}</div>
-</div>
+<div class="state" id="state]I["></div>
+<div class="label" id="label]I[">#{this.label}</div>

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

@@ -1,46 +1,51 @@
-
-.popupmenu_control,
-.popupmenu_edge_left,
-.popupmenu_center,
-.popupmenu_edge_right,
-.popupmenu_label {
+.default.popupmenu {
+  cursor: pointer;
+}
+.default.popupmenu.disabled {
+  cursor: default;
+}
+.default.popupmenu > .bg,
+.default.popupmenu > .bg > .w,
+.default.popupmenu > .bg > .c,
+.default.popupmenu > .bg > .e,
+.default.popupmenu > .label {
   position: absolute;
   top: 0px; height: 23px;
 }
 
-.popupmenu_control {
+.default.popupmenu > .bg {
   left: 0px; right: 0px;
   cursor: pointer;
 }
-.disabled .popupmenu_control {
+.default.popupmenu > .disabled .bg {
   cursor: default;
 }
 
-.popupmenu_edge_left,
-.popupmenu_center,
-.popupmenu_edge_right {
-  background-image: #{this.getCssFilePath('popupmenu.png')};
+.default.popupmenu > .bg > .w,
+.default.popupmenu > .bg > .c,
+.default.popupmenu > .bg > .e {
+  background-image: #url(popupmenu.png);
 }
 
-.popupmenu_edge_left {
+.default.popupmenu > .bg > .w {
   left: 0px; width: 9px;
   background-position: 0px 0px;
   background-repeat: no-repeat;
 }
 
-.popupmenu_edge_right {
+.default.popupmenu > .bg > .e {
   right: 0px; width: 17px;
   background-position: -9px 0px;
   background-repeat: no-repeat;
 }
 
-.popupmenu_center {
+.default.popupmenu > .bg > .c {
   left: 9px; right: 17px;
   background-position: 0px -23px;
   background-repeat: repeat-x;
 }
 
-.popupmenu_label {
+.default.popupmenu > .label {
   left: 13px; right: 11px; top: 0px;
   height: 22px;
   text-align: left;
@@ -51,11 +56,14 @@
   font-family: Helvetica, Arial, sans-serif;
   font-size: 12px;
   color: #333;
-  line-height: #{BROWSER_TYPE.ie7?'20':'22'}px;
+  line-height: 22px;
+}
+.default.popupmenu.ie7 > .label{
+  line-height: 20px;
 }
-.popupmenu_control:hover > .popupmenu_label {
+.default.popupmenu > .bg:hover > .label {
   color: #000;
 }
-.disabled .popupmenu_control {
+.default.popupmenu.disabled > .bg {
   opacity: 0.6;
 }

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

@@ -1,8 +1,6 @@
-<div class="popupmenu_control" id="control]I[">
-  <span id="bg]I[">
-    <div class="popupmenu_edge_left"></div>
-    <div class="popupmenu_center"></div>
-    <div class="popupmenu_edge_right"></div>
-  </span>
-  <div class="popupmenu_label" id="label]I[">#{this.label}</div>
-</div>
+<span class="bg" id="bg]I[">
+  <div class="w"></div>
+  <div class="c"></div>
+  <div class="e"></div>
+</span>
+<div class="label" id="label]I[">#{this.label}</div>

data/plugins/client_pkg/lib/client_pkg_build.rb

@@ -51,6 +51,7 @@ class ClientPkgBuild
   def read_file( path )
     filehandle = open( path, 'rb' )
     filedata   = filehandle.read
+    filedata.force_encoding( 'UTF-8' ) if filedata.encoding != 'UTF-8'
     filehandle.close
     return filedata
   end
@@ -108,9 +109,13 @@ class ClientPkgBuild
     tmpl.gsub!( TMPL_RE ) do
       ( js_type, js_code ) = [ $1, $2 ]
       begin
-        js_code = CoffeeScript.compile( js_code, :bare => true ) if js_code.start_with?('#!coffee')
+        if js_code.start_with?('#!coffee')
+          js_code = CoffeeScript.compile( js_code, :bare => true )
+        end
       rescue ExecJS::RuntimeError
-        js_code = "console.log('Invalid coffee in template #{theme_name}/#{component_name}:',#{js_code.to_json})"
+        js_code = "console.log('Invalid CoffeeScript in template #{theme_name}/#{component_name}:',#{js_code.to_json});"
+      rescue Encoding::CompatibilityError
+        js_code = "console.log('Invalid charset in CoffeeScript template #{theme_name}/#{component_name}:',#{js_code.to_json});"
       end
       if cached_idx.has_key?( js_code )
         seq_id = cached_idx[ js_code ]
@@ -127,6 +132,7 @@ class ClientPkgBuild
         else
           fn_args = ''
         end
+        js_code.force_encoding 'UTF-8' if js_code.encoding != 'UTF-8'
         if js_type == '$'
           js_cmds << "function(#{fn_args}){#{js_code};}"
         else
@@ -135,6 +141,7 @@ class ClientPkgBuild
       end
       "#{js_type}{#{seq_id}}"
     end
+    tmpl.force_encoding 'UTF-8' if tmpl.encoding != 'UTF-8'
     %{[[#{js_cmds.join(',')}],#{tmpl.to_json}]}
   end
 
@@ -290,13 +297,18 @@ class ClientPkgBuild
           begin
             coffee_src = read_file( src_path )
             js_data = CoffeeScript.compile( coffee_src, :bare => true )
-          rescue CoffeeScript::CompilationError, ExecJS::RuntimeError
+          rescue CoffeeScript::CompilationError, ExecJS::RuntimeError => e
             if has_js
+              warn "CoffeeScript Compilation failure #1: #{e.inspect}"
               js_data = %{console.log( 'WARNING: CoffeeScript complilation failed for source file #{src_path.to_json}, using the js variant instead.' );}
               js_data += read_file( File.join( bundle_path, bundle_name+'.js' ) )
             else
+              warn "CoffeeScript Compilation failure #2: #{e.inspect}"
               js_data = %{console.log( 'WARNING: CoffeeScript complilation failed for source file #{src_path.to_json}' );}
             end
+          rescue => e
+            warn "CoffeeScript Compilation failure #3: #{e.inspect}"
+            js_data = %{console.log( 'WARNING CoffeeScript complilation failed for source file #{src_path.to_json}' );}
           end
         else
           js_data = read_file( src_path )
@@ -565,6 +577,19 @@ class ClientPkgBuild
     end
   end
 
+  def package_array_cleanup_encodings( package_array )
+    outp = ''
+    package_array.each do |item|
+      if item.encoding != 'UTF-8'
+        puts "item has invalid encoding(#{item.encoding.to_s}): #{item[0..70]}"
+        outp += item.force_encoding( 'UTF-8' )
+      else
+        outp += item
+      end
+    end
+    outp
+  end
+
   def compose_destinations
     @destination_files = {} # rename to package_products
     @destination_origsize = {}
@@ -580,7 +605,11 @@ class ClientPkgBuild
       end
     end
     @destination_files.each do | package_name, package_array |
-      package_data = package_array.join("\n")
+      begin
+        package_data = package_array.join("\n")
+      rescue Encoding::CompatibilityError
+        package_data = package_array_cleanup_encodings( package_array )
+      end
       @destination_files[ package_name ] = package_data
     end
   end