rsence-pre 3.0.0.5 → 3.0.0.6

data/client/js/controls/tab/themes/default/tab.css

@@ -1,7 +1,7 @@
 /* tab bar */
 .tab_label {
   position: absolute;
-  top: 0px; left: 0px right: 0px; height: 24px;
+  top: 0; left: 0; right: 0; height: 24px;
   cursor: pointer;
 }
 
@@ -9,7 +9,7 @@
 .tab_label .item_fg,
 .tab_label .item_bg {
   position: absolute;
-  top: 0px; height: 24px;
+  top: 0; height: 24px;
   background-repeat: repeat-x;
 }
 .tab_label,
@@ -22,33 +22,33 @@
 }
 .tab_label_fill_bg {
   position: absolute;
-  top: 0px; left: 0px; right: 0px; height: 24px;
-  background-position: 0px -96px;
+  top: 0; left: 0; right: 0; height: 24px;
+  background-position: 0 -96px;
   background-repeat: repeat-x;
 }
 
 .tab_label .edge_left {
   position: absolute;
-  top: 0px; left: 0px; width: 12px; height: 24px;
-  background-position: 0px 0px;
+  top: 0; left: 0; width: 12px; height: 24px;
+  background-position: 0 0;
 }
 .tab_label .item_bg .edge_left {
-  background-position: -24px 0px;
+  background-position: -24px 0;
 }
 
 .tab_label .edge_right {
   position: absolute;
-  top: 0px; right: 0px; width: 9px; height: 24px;
-  background-position: -12px 0px;
+  top: 0; right: 0; width: 9px; height: 24px;
+  background-position: -12px 0;
 }
 .tab_label .item_bg .edge_right {
-  background-position: -36px 0px;
+  background-position: -36px 0;
 }
 
 .tab_label .tablabel {
   position: absolute;
-  top: 0px; left: 12px; right: 9px; height: 24px;
-  background-position: 0px -24px;
+  top: 0; left: 12px; right: 9px; height: 24px;
+  background-position: 0 -24px;
   background-repeat: repeat-x;
   vertical-align: middle;
   text-align: center;
@@ -56,24 +56,24 @@
   line-height: 26px;
   overflow: hidden;
   text-align: center; vertical-align: middle;
-  font-family: Arial, sans-serif;
+  font-family: Helvetica, Arial, sans-serif;
   font-size: 12px; font-weight: bold;
   color: #333;
 }
 .tab_label .item_bg .tablabel {
-  background-position: 0px -48px;
+  background-position: 0 -48px;
   color: #666;
 }
 
 .tab_bg {
   position: absolute;
-  top: 24px; left: 0px; right: 0px; bottom: 0px;
+  top: 24px; left: 0; right: 0; bottom: 0;
   border-radius: 0 0 3px 3px;
   background-image: #{this.getCssFilePath('tab_border_pattern.png')};
 }
 .tab_fg {
   position: absolute;
-  top: 0px; left: 1px; right: 1px; bottom: 1px;
+  top: 0; left: 1px; right: 1px; bottom: 1px;
   border-radius: 0 0 3px 3px;
   background-image: #{this.getCssFilePath('tab_bg_color.png')};
 }

data/client/js/controls/tab/themes/default/tab.html

@@ -3,4 +3,4 @@
 </div>
 <div class="tab_label" id="label]I["></div>
 <div class="tab_label_fill_bg" id="state]I["></div>
-${this.tabLabelLeftEdge=12;this.tabLabelRightEdge=9;this.tabLabelHeight=24;this.fontStyle='font-family:Arial,sans-serif;font-size:12px;font-weight:bold;';this.tabLabelFillBg=true;}
+${this.tabLabelLeftEdge=12;this.tabLabelRightEdge=9;this.tabLabelHeight=24;this.fontStyle='font-family: Helvetica, Arial, sans-serif;font-size:12px;font-weight:bold;';this.tabLabelFillBg=true;}

data/client/js/controls/textarea/textarea.js

@@ -11,6 +11,6 @@ var//RSence.Controls
 HTextArea = HTextControl.extend({
 
   componentName: "textarea",
-  defaultKey: function(){return true;} // bypass handler for return presses
+  defaultKey: function(){return false;} // bypass handler for return presses
 
 });

data/client/js/controls/textarea/themes/default/textarea.css

@@ -1,7 +1,7 @@
 .default .textarea_input {
   position: absolute;
   display: block;
-  font-family: Arial, sans-serif;
+  font-family: Helvetica, Arial, sans-serif;
   font-size: 13px;
   color: #000;
   background-color: transparent;

data/client/js/controls/textcontrol/themes/default/textcontrol.css

@@ -2,7 +2,7 @@
 .default .textcontrol_input {
   position: absolute;
   display: block;
-  font-family: Arial, sans-serif;
+  font-family: Helvetica, Arial, sans-serif;
   font-size: 13px;
   color: #000;
   background-color: transparent;
@@ -54,7 +54,6 @@
 
 .default .active>.textcontrol_bg {
   left: 0; top: 0; right: 0; bottom: 0;
-  -moz-box-shadow: 0 0 3px #333;
   -webkit-box-shadow: 0 0 3px #333;
   box-shadow: 0 0 3px #333;
 }

data/client/js/controls/uploader/themes/default/uploader.css

@@ -1,59 +1,44 @@
 .uploader_iframe {
-  visibility: hidden;
-  width: 0px;
-  height: 0px;
-  border-width: 0px;
+  visibility: hidden; width: 0; height: 0; border-width: 0;
 }
 
 .uploader_form {
-  visibility: hidden;
-  position: absolute;
-  display: block;
-  left: 0px;
-  top: 0px;
-  right: 0px;
-  bottom: 0px;
-  cursor: pointer;
+  visibility: hidden; position: absolute; display: block;
+  left: 0; top: 0; right: 0; bottom: 0; cursor: pointer;
 }
 
 .uploader_file_wrap {
   position: absolute;
-  left: -350px; top: 0px;
-  bottom: 0px; right: 0px;
+  left: -350px; top: 0;
+  bottom: 0; right: 0;
   line-height: 200px;
   font-size: 200px;
 }
 
 .uploader_file {
   position: absolute;
-  right: 0px; top: 0px;
+  right: 0; top: 0;
   display: block;
   line-height: 200px;
   font-size: 200px;
   width: 1000px;
   height: 200px;
-  -moz-opacity:0;
-  filter:alpha(opacity: 0);
-  opacity: 0.0;
+  /*filter:alpha(opacity: 0);*/
+  opacity: 0.001;
   text-align: right;
   cursor: pointer;
   z-index: 100;
 }
-.uploader_file:hover {
-  background-color: #ff0;
-}
 
 .ack_button {
   visibility: hidden;
-  left: auto; right: 0px; width: 48px;
 }
 
 .upload_progress {
   visibility: hidden;
   position: absolute;
-  left: 0px; top: 0px;
-  right: 0px; height: 24px;
-  font-family: Arial, sans-serif;
+  left: 0; top: 0; right: 0; height: 24px;
+  font-family: Helvetica, Arial, sans-serif;
   line-height: 24px;
   vertical-align: middle;
   font-size: 12px;
@@ -69,40 +54,3 @@
   right: 0px; top: 4px; width: 16px; height: 16px;
   background-image: #{this.getCssFilePath('upload_progress.gif')};
 }
-
-.disabled > .uploader > .button_control > .button_edge_left {
-  background-position: 0px -144px;
-}
-.enabled > .uploader:hover > .button_control > .button_edge_left {
-  background-position: 0px -48px;
-}
-.enabled > .uploader:active > .button_control > .button_edge_left {
-  background-position: 0px -96px;
-}
-.disabled > .uploader > .button_control > .button_edge_right {
-  background-position: -42px -144px;
-}
-.enabled > .uploader:hover > .button_control > .button_edge_right {
-  background-position: -42px -48px;
-}
-.enabled > .uploader:active > .button_control > .button_edge_right {
-  background-position: -42px -96px;
-}
-.disabled > .uploader > .button_control > .button_center {
-  background-position: 0px -168px;
-}
-.enabled > .uploader:hover > .button_control > .button_center {
-  background-position: 0px -72px;
-}
-.enabled > .uploader:active > .button_control > .button_center {
-  background-position: 0px -120px;
-}
-.disabled > .uploader > .button_control > .button_label {
-  color: #999;
-}
-.enabled > .uploader:hover > .button_control > .button_label {
-  color: #000;
-}
-.enabled > .uploader:active > .button_control > .button_label {
-  color: #000;
-}

data/client/js/controls/uploader/themes/default/uploader.html

@@ -1,27 +1,33 @@
-<div class="uploader">
-  <iframe id="iframe#{this.elemId}" name="upload_target_#{this.elemId}" src="/U/iframe_html" class="uploader_iframe"></iframe>
-  <div class="upload_progress" id="upload_progress#{this.elemId}">
-    <div id="progress_label#{this.elemId}" class="progress_message">#{this.label}</div>
-    <div id="progress_indicator#{this.elemId}" class="progress_indicator"></div>
-  </div>
-  <div class="button_control" id="button#{this.elemId}">
-    <div class="button_edge_left"></div>
-    <div class="button_center"></div>
-    <div class="button_edge_right"></div>
-    <div class="button_label" id="button_label]I[">#{this.label}</div>
-    <div class="button_antiselect"></div>
-  </div>
-  <div class="button_control ack_button" id="ack_button#{this.elemId}">
-    <div class="button_edge_left"></div>
-    <div class="button_center"></div>
-    <div class="button_edge_right"></div>
-    <div class="button_label">#{this.getLocaleString('HUploader.strings.ok')}</div>
-    <div class="button_antiselect"></div>
+<iframe id="iframe]I[" name="upload_target_]I[" src="/U/iframe_html" class="uploader_iframe"></iframe>
+<div class="upload_progress" id="upload_progress]I[">
+  <div id="progress_label]I[" class="progress_message">#{this.label}</div>
+  <div id="progress_indicator]I[" class="progress_indicator"></div>
+</div>
+<div class="button_control ack_button" id="ack_button]I[" style="left: auto; right: 0; width: 48px;">
+  <div class="button_bg" id="ack_bg]I["></div>
+  <div class="button_label" id="ack_button_label]I[">#{this.getLocaleString('HUploader.strings.ok')}</div>
+</div>
+<div class="button_control" id="button]I[">
+  <div class="button_bg" id="bg]I["></div>
+  <div class="button_label" id="button_label]I[">#{this.label}</div>
+<form id="form]I[" name="upload_form_]I[" enctype="multipart/form-data" method="POST" action="/U/NoUploadKey" target="upload_target_]I[" class="uploader_form">
+  <div class="uploader_file_wrap">
+    <input align="right" id="file]I["  name="file_data" type="file" onchange="HSystem.views[#{this.viewId}].upload();" class="uploader_file" size="1" />
   </div>
-  <form id="form#{this.elemId}" name="upload_form_#{this.elemId}" enctype="multipart/form-data" method="POST" action="/U/NoUploadKey" target="upload_target_#{this.elemId}" class="uploader_form">
-    <div class="uploader_file_wrap">
-      <input align="right" id="file#{this.elemId}"  name="file_data" type="file" onchange="HSystem.views[#{this.viewId}].upload();" class="uploader_file" size="1" />
-    </div>
-    <input id="value#{this.elemId}" name="value_id"  type="hidden" value="NoUploadValue" />
-  </form>
+  <input id="value]I[" name="value_id"  type="hidden" value="NoUploadValue" />
+</form>
 </div>
+${#!coffee
+@themeStyle = ->
+  _labelHeight = (@rect.height-4)+'px'
+  _fontSize = Math.floor(@rect.height*0.5)+'px'
+  for [_key,_value] in [
+      ['height',_labelHeight],
+      ['lineHeight',_labelHeight],
+      ['fontSize',_fontSize] ]
+    for _labelElem in ['progress_label','ack_button_label','button_label']
+      @setStyleOfPart(_labelElem,_key,_value)
+  _radius = Math.floor(@rect.height / 6)+'px'
+  for _bgElem in ['bg','ack_bg']
+    @setStyleOfPart(_bgElem,'borderRadius',_radius)
+}

data/client/js/controls/uploader/uploader.coffee

@@ -22,6 +22,7 @@ HUploader = HControl.extend
   uploadState: false
   uploadKey: false
   markupElemNames: [
+    'bg',
     'form',
     'file',
     'iframe',
@@ -31,12 +32,14 @@ HUploader = HControl.extend
     'button',
     'button_label',
     'value',
-    'ack_button'
+    'ack_button',
+    'ack_bg',
+    'ack_button_label'
   ]
 
   defaultEvents:
     click: true
-  
+
   setUploadKey: (_uploadKey, _label)->
     @setStyleOfPart( 'upload_progress', 'visibility', 'hidden' )
     @setStyleOfPart( 'progress_indicator', 'visibility', 'hidden' )
@@ -47,7 +50,7 @@ HUploader = HControl.extend
     @setAttrOfPart( 'form', 'action', '/U/'+_uploadKey, true )
     @setAttrOfPart( 'file', 'value', '', true )
     @uploadKey = _uploadKey
-  
+
   setProgressState: (_state, _label)->
     @setStyleOfPart( 'upload_progress', 'visibility', 'inherit' )
     if _state == 3
@@ -61,7 +64,7 @@ HUploader = HControl.extend
     @setStyleOfPart( 'form', 'visibility', 'hidden' )
     if _state == 1
       @elemOfPart( 'form' ).submit()
-  
+
   setErrorState: (_label)->
     @setStyleOfPart( 'progress_indicator', 'visibility', 'hidden' )
     @setStyleOfPart( 'ack_button', 'visibility', 'inherit' )
@@ -83,7 +86,7 @@ HUploader = HControl.extend
           @setProgressState( _state, _label )
         else if _state < 0
           @setErrorState( _label )
-  
+
   refreshValue: ->
     return unless typeof @value == 'string'
     return unless ~@value.indexOf(':::')
@@ -95,9 +98,9 @@ HUploader = HControl.extend
     )
   upload: ->
     @setValue( '1:::'+@uploadKey )
-  
+
   getNewUploadKey: ->
     @setValue( '4:::'+@uploadKey )
-  
+
   click: ->
     @getNewUploadKey() if @uploadState == 3 or @uploadState < 0

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

@@ -1,7 +1,7 @@
 
 .window_shadow,
 .window_titlebar,
-.window_titlebar_edge_left, 
+.window_titlebar_edge_left,
 .window_titlebar_center,
 .window_titlebar_edge_right,
 .window_bg,
@@ -36,13 +36,11 @@
 .window_shadow {
   left: 4px; right: 4px; top: 4px; bottom: 4px;
   overflow: visible;
-  -moz-box-shadow: 3px 3px 20px #333, 3px 3px 10px #000;
   -webkit-box-shadow: 3px 3px 20px #333, 3px 3px 10px #000;
   box-shadow: 3px 3px 20px #333, 3px 3px 10px #000;
 }
 
 .inactive > .window_shadow {
-  -moz-box-shadow: 3px 3px 13px #333;
   -webkit-box-shadow: 3px 3px 13px #333;
   box-shadow: 3px 3px 13px #333;
 }
@@ -160,7 +158,7 @@
   line-height: 26px;
   text-align: center;
   vertical-align: middle;
-  font-family: Arial, sans-serif;
+  font-family: Helvetica, Arial, sans-serif;
   font-size: 13px;
   font-weight: bold;
   color: #000;

data/client/js/core/elem/elem.coffee

@@ -805,7 +805,7 @@ ELEM = HClass.extend
       _key   = 'filter'
       _value = "progid:DXImageTransform.Microsoft.gradient( startColorstr='#{_gradient.start}', endColorstr='#{_gradient.end}',GradientType=0 )"
     # IE9
-    else if BROWSER_TYPE.ie9 or BROWSER_TYPE.ie10
+    else if BROWSER_TYPE.ie9 # or BROWSER_TYPE.ie10
       # IE9 SVG, needs conditional override of 'filter' to 'none'
       # Also static white-shaded svg, needs a svg source to base64 utility
       _key = 'background'
@@ -816,7 +816,7 @@ ELEM = HClass.extend
       for _step in _gradient.steps
         _svg += """<stop offset="#{_step[0]}%" stop-color="##{_step[1]}" />"""
       _svg += """<stop offset="100%" stop-color="##{_gradient.end}" />"""
-      _svg += _svgSteps.join('')
+      # _svg += _svgSteps.join('')
       _svg += '</linearGradient>'
       _svg += '<rect x="0" y="0" width="1" height="1" fill="url(#gradientie9)" />'
       _svg += '</svg>'
@@ -843,7 +843,7 @@ ELEM = HClass.extend
     else if BROWSER_TYPE.opera
       _key   = 'background'
       _steps = @_standardGradientSteps(_gradient.start,_gradient.steps,_gradient.end).join(',')
-      _value = "-o-linear-gradient(top, )"
+      _value = "-o-linear-gradient(top, #{_steps})"
     else
       # Old browsers
       _key   = 'background'
@@ -875,7 +875,7 @@ ELEM = HClass.extend
       _browserType.ie10 = !!~_ua.indexOf('MSIE 10')
       unless _browserType.ie9
         @sha = SHA.new(8) # SHA1 needed for IE9/10 SVG base64 encoding
-        _browserType.ie9 = _browserType.ie10 # IE 10 is treated like IE 9
+        # _browserType.ie9 = _browserType.ie10 # IE 10 is treated like IE 9
     _browserType.mac = !!~_ua.indexOf('Macintosh')
     _browserType.win = !!~_ua.indexOf('Windows')
     _browserType.firefox = !!~_ua.indexOf('Firefox')

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

@@ -4,13 +4,13 @@
 ***/
 var//RSence.Core
 Event = {
-  
+
 /** Returns the element of the event.
   **/
   element: function(e) {
     return e.target || e.srcElement;
   },
-  
+
 /** Returns the mouse cursor x -coordinate of the event.
   **/
   pointerX: function(e) {
@@ -35,23 +35,23 @@ Event = {
       e.cancelBubble = true;
     }
   },
-  
+
 /** Returns true if the left mouse butten was clicked.
   **/
   isLeftClick: function(e) {
     // IE: left 1, middle 4, right 2
-    if (BROWSER_TYPE.ie && !BROWSER_TYPE.ie9) {
+    if (BROWSER_TYPE.ie && !BROWSER_TYPE.ie9 && !BROWSER_TYPE.ie10) {
       return (e.button === 1 || e.button === 3 || e.button === 5);
     }
     else {
       return (e.button === 0);
     }
   },
-  
+
 /** List of event observers
   **/
   observers: false,
-  
+
   /* Implementation of observe */
   _observeAndCache: function(_elem, _name, _function, _useCapture) {
     if (!Event.observers) {
@@ -66,7 +66,7 @@ Event = {
       _elem.attachEvent("on" + _name, _function);
     }
   },
-  
+
 /** Flushes the event observer cache.
   **/
   unloadCache: function() {
@@ -83,7 +83,7 @@ Event = {
     }
     Event.observers = false;
   },
-  
+
 /** Starts observing the named event of the element and
   * specifies a callback function.
   **/
@@ -92,7 +92,7 @@ Event = {
     Event._observeAndCache(_elem, _name, _function, _useCapture);
     return _function;
   },
-  
+
 /** Stops observing the named event of the element and
   * removes the callback function.
   **/
@@ -120,7 +120,7 @@ Event = {
       }
     }
   },
-  
+
   // List of ASCII "special characters":
   KEY_BACKSPACE: 8,
   KEY_TAB: 9,
@@ -135,7 +135,7 @@ Event = {
   KEY_END: 35,
   KEY_PAGEUP: 33,
   KEY_PAGEDOWN: 34
-  
+
 };
 
 // Activates the garbage collector of Internet Explorer

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

@@ -36,7 +36,7 @@
   position: absolute;
   top: 0px; left: 20px; right: 20px; height: 20px;
   color: #000;
-  font-family: Arial, sans-serif;
+  font-family: Helvetica, Arial, sans-serif;
   font-weight: normal;
   font-size: 13px;
   line-height: 20px;
@@ -51,7 +51,7 @@
   position: absolute;
   top: 0px; height: 15px; width: 25px;
   color: #000;
-  font-family: Arial, sans-serif;
+  font-family: Helvetica, Arial, sans-serif;
   font-size: 11px;
   line-height: 16px;
   vertical-align: middle;
@@ -73,7 +73,7 @@
   position: absolute;
   text-decoration: none;
   top: 0px;
-  font-family: Arial, sans-serif;
+  font-family: Helvetica, Arial, sans-serif;
   font-size: 15px;
   vertical-align: middle;
   text-align: center;

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

@@ -784,6 +784,40 @@ EventManagerApp = HApplication.extend
     # Remove possible selections.
     ELEM.get(0).focus()
   #
+  # Patches IE classes that match css :active with .ieActive classes
+  _ieClassNamePatched: []
+  _ieClassNamePatch: (_viewId)->
+    _elemId = @_views[_viewId].elemId
+    _elem = ELEM.get( _elemId )
+    _ieClassNamePatched = @_ieClassNamePatched
+    _ieClassNames = HThemeManager._ieActiveCssClassMatch
+    _hasClassName = (_elem,_className)->
+      ~_elem.className.split(' ').indexOf(_className)
+    _addClassName = (_elem)->
+      _classNames = _elem.className.trim().split(' ')
+      _classNames.push('ieActive')
+      _elem.className = _classNames.join(' ')
+      _ieClassNamePatched.push(_elem)
+    _level = 0
+    _patcher = (_elem)->
+      return if _level > 10
+      for _child in _elem.childNodes
+        for _className in _ieClassNames
+          _addClassName(_elem) if _hasClassName(_elem,_className) and not _hasClassName(_elem,'ieActive')
+        _level += 1
+        _patcher(_child)
+        _level -= 1
+    _patcher(_elem)
+  _ieClassNameUnPatch: ->
+    _ieClassNamePatched = @_ieClassNamePatched
+    @_ieClassNamePatched = []
+    _delClassName = (_elem)->
+      _classNames = _elem.className.split(' ')
+      _classNames.splice( _classNames.indexOf( 'ieActive' ), 1 )
+      _elem.className = _classNames.join(' ')
+    for _elem in _ieClassNamePatched
+      _delClassName(_elem)
+  #
   # Mouse button press manager. Triggered by the global mouseDown event.
   # Delegates the following event responder methods to active HControl instances:
   # - mouseDown
@@ -825,6 +859,9 @@ EventManagerApp = HApplication.extend
         _dragged.unshift( _viewId )
         _stop = true if _ctrl.startDrag( x, y, _leftClick )
     @_cancelTextSelection() unless _startDragIds.length == 0 and _mouseDownIds.length == 0
+    if BROWSER_TYPE.ie
+      for _viewId in _focused
+        @_ieClassNamePatch(_viewId)
     Event.stop(e) if _stop
   #
   # Mouse button press manager. Triggered by the global mouseDown event.
@@ -877,6 +914,7 @@ EventManagerApp = HApplication.extend
     @_listeners.hovered = []
     @_listeners.dragged = []
     @_cancelTextSelection() unless _endDragIds.length == 0 and _mouseUpIds.length == 0
+    @_ieClassNameUnPatch() if BROWSER_TYPE.ie and @_ieClassNamePatched.length
     Event.stop(e) if _stop
   #
   # Handles mouse button clicks
@@ -1082,11 +1120,16 @@ EventManagerApp = HApplication.extend
       return null unless @_listeners.active
       _ctrl = @_views[@_listeners.active[0]]
       return true if _ctrl[_methodName]? and _ctrl[_methodName]()
+      _stop = null
       for _viewId in _ctrl.parent.views
         continue if _ctrl.viewId == _viewId
         _ctrl = @_views[_viewId]
         if _ctrl[_methodName]?
-          return true if _ctrl[_methodName]()
+          _stopStatus = _ctrl[_methodName]()
+          if _stopStatus == false or _stopStatus == true
+            _stop = _stopStatus unless _stop
+        if _stop != null
+          return _stop
     if _ctrl.parent?
       return true if @defaultKey(_methodName,_ctrl.parent)
     return null