rsence-pre 2.3.0.20 → 2.3.0.21

data/js/controls/textarea/themes/default/textarea.html

@@ -10,11 +10,11 @@
 <div class="textcontrol_se"></div>
 <div class="textcontrol_sw"></div>
 
-<div id="subview#{_ID}" class="textcontrol_subview"></div>
+<div id="subview]I[" class="textcontrol_subview"></div>
 
-<div id="label#{_ID}" title="#{this.label}" class="textarea_input_parent">
+<div id="label]I[" title="#{this.label}" class="textarea_input_parent">
   <textarea class="textarea_input" style="resize:none;" #{this.enabled?'':'disabled'}
     onfocus="HSystem.views[#{this.viewId}].textFocus();" 
     onblur="HSystem.views[#{this.viewId}].textBlur();" 
-    id="value#{_ID}">#{this.value}</textarea>
+    id="value]I[">#{this.value}</textarea>
 </div>

data/js/controls/textcontrol/textcontrol.coffee

@@ -204,6 +204,9 @@ HTextControl = HControl.extend
     _inputElement = @getInputElement()
     if _inputElement == null or @hasTextFocus == false
       _rangeArr = [ 0, 0 ]
+    ## Other browsers
+    else if _inputElement.selectionStart
+      _rangeArr = [ _inputElement.selectionStart, _inputElement.selectionEnd ]
     ## Internet Explorer:
     else if document.selection
       # create a range object
@@ -216,7 +219,7 @@ HTextControl = HControl.extend
       # create random marker to replace the text with
       _marker = @_randomMarker()
       # re-generate marker if it's found in the text.
-      _marker = @_randomMarker() until ~_origValue.indexOf( _marker )
+      _marker = @_randomMarker() while ~_origValue.indexOf( _marker )
       _markerLength = _marker.length
       # temporarily set the text of the selection to the unique marker
       _range.text = _marker
@@ -224,9 +227,6 @@ HTextControl = HControl.extend
       _range.text = _rangeText
       _markerIndex = _markerValue.indexOf( _marker )
       _rangeArr = [ _markerIndex, _markerIndex + _rangeLength ]
-    ## Other browsers
-    else if _inputElement.selectionStart
-      _rangeArr = [ _inputElement.selectionStart, _inputElement.selectionEnd ]
     ## No support:
     else
       _rangeArr = [ 0, 0 ]

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

@@ -9,7 +9,11 @@
   vertical-align: middle;
   border: 0;
   left: 0; top: 0;
-  #{(BROWSER_TYPE.firefox||BROWSER_TYPE.ie7||BROWSER_TYPE.ie8||BROWSER_TYPE.ie9||BROWSER_TYPE.opera)?'padding-left:2px;width:100% !important;height:90% !important;':BROWSER_TYPE.ie6?'right:4px;bottom:2px;':'padding:2px;right:0px;bottom:0px;width:auto;height:auto;'}
+  #{(
+  (BROWSER_TYPE.firefox||BROWSER_TYPE.ie7||BROWSER_TYPE.ie8||BROWSER_TYPE.ie9||BROWSER_TYPE.ie10||BROWSER_TYPE.opera)?
+    'padding-left:2px;width:100% !important;height:90% !important;':
+    'padding:2px;right:0px;bottom:0px;width:auto;height:auto;'
+  )}
 }
 
 .default .textcontrol_input:focus {
@@ -34,7 +38,11 @@
 .default .textcontrol_input_parent {
   position: absolute;
   z-index: 2;
-  #{((BROWSER_TYPE.chrome && BROWSER_TYPE.mac)||BROWSER_TYPE.firefox||BROWSER_TYPE.ie7||BROWSER_TYPE.ie8||BROWSER_TYPE.ie9||BROWSER_TYPE.opera)?'left:0;padding-left:1px;top:0;right:4px;bottom:0;':BROWSER_TYPE.ie6?'left:2px;top:1px;right:1px;bottom:1px;':'left:-2px;top:-2px;right:-2px;bottom:-2px;'}
+  #{(
+  ((BROWSER_TYPE.chrome && BROWSER_TYPE.mac)||BROWSER_TYPE.firefox||BROWSER_TYPE.ie7||BROWSER_TYPE.ie8||BROWSER_TYPE.ie9||BROWSER_TYPE.ie10||BROWSER_TYPE.opera)?
+    'left:0;padding-left:1px;top:0;right:4px;bottom:0;':
+    'left:-2px;top:-2px;right:-2px;bottom:-2px;'
+  )}
   #{(BROWSER_TYPE.chrome && BROWSER_TYPE.mac)?'top:1px;':''}
 }
 
@@ -42,7 +50,6 @@
   position: absolute;
   left: 2px; top: 2px; right: 2px; bottom: 2px;
   background-color: #fff;
-  #{BROWSER_TYPE.ie6?'font-size:0;line-height:0;':''}
 }
 
 .default .active>.textcontrol_bg {
@@ -65,7 +72,6 @@
   width: 7px; height: 7px;
   background-repeat: no-repeat;
   background-image: #{this.getCssFilePath('textcontrol_parts1.png')};
-  #{BROWSER_TYPE.ie6?'font-size:0;line-height:0;':''}
 }
 
 .default .textcontrol_nw {
@@ -96,7 +102,6 @@
   width: 7px; top: 7px; bottom: 7px;
   background-repeat: repeat-y;
   background-image: #{this.getCssFilePath('textcontrol_parts3.png')};
-  #{BROWSER_TYPE.ie6?'font-size:0;line-height:0;':''}
 }
 
 .default .textcontrol_w {
@@ -117,7 +122,6 @@
   height: 7px; left: 7px; right: 7px;
   background-repeat: repeat-x;
   background-image: #{this.getCssFilePath('textcontrol_parts2.png')};
-  #{BROWSER_TYPE.ie6?'font-size:0;line-height:0;':''}
 }
 
 .default .textcontrol_n {

data/js/controls/textcontrol/themes/default/textcontrol.html

@@ -1,4 +1,4 @@
-<div class="textcontrol_bg" id="bg#{_ID}"></div>
+<div class="textcontrol_bg" id="bg]I["></div>
 
 <div class="textcontrol_n"></div>
 <div class="textcontrol_s"></div>
@@ -10,11 +10,11 @@
 <div class="textcontrol_se"></div>
 <div class="textcontrol_sw"></div>
 
-<div id="subview#{_ID}" class="textcontrol_subview"></div>
+<div id="subview]I[" class="textcontrol_subview"></div>
 
-<div id="label#{_ID}" title="#{this.label}" class="textcontrol_input_parent">
+<div id="label]I[" title="#{this.label}" class="textcontrol_input_parent">
   <input type="text" class="textcontrol_input" #{this.enabled?'':'disabled'}
     onfocus="HSystem.views[#{this.viewId}].textFocus();" 
     onblur="HSystem.views[#{this.viewId}].textBlur();" 
-    id="value#{_ID}" value="#{this.value}" />
+    id="value]I[" value="#{this.value}" />
 </div>

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

@@ -8,7 +8,7 @@
     <div class="button_edge_left"></div>
     <div class="button_center"></div>
     <div class="button_edge_right"></div>
-    <div class="button_label" id="button_label#{_ID}">#{this.label}</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}">

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

@@ -13,11 +13,11 @@ ${this.setStyle('overflow','visible')}
   <div class="window_body_corner_left"></div>
   <div class="window_body_corner_right"></div>
 </div>
-<div class="window_label" id="label#{_ID}">#{this.label}</div>
-<div class="window_controls" id="control#{_ID}">
-  <div class="window_controls_close" id="close#{_ID}"></div>
-  <div class="window_controls_collapse" id="collapse#{_ID}"></div>
-  <div class="window_controls_zoom" id="zoom#{_ID}"></div>
+<div class="window_label" id="label]I[">#{this.label}</div>
+<div class="window_controls" id="control]I[">
+  <div class="window_controls_close" id="close]I["></div>
+  <div class="window_controls_collapse" id="collapse]I["></div>
+  <div class="window_controls_zoom" id="zoom]I["></div>
 </div>
-<div class="window_subview" id="subview#{_ID}"></div>
-<div class="window_resize_se" id="resize#{_ID}"></div>
+<div class="window_subview" id="subview]I["></div>
+<div class="window_resize_se" id="resize]I["></div>

data/js/core/elem/elem.coffee

@@ -15,7 +15,6 @@ BROWSER_TYPE =
   ie10: false
   opera: false
   safari: false
-  symbian: false
   chrome: false
   firefox: false
   firefox2: false
@@ -264,7 +263,7 @@ ELEM = HClass.extend
   Sets the opcity of the element as a number equaling or between 0 and 1
   ###
   setOpacity: (_id, _opacity)->
-    if BROWSER_TYPE.ie6 or BROWSER_TYPE.ie7 or BROWSER_TYPE.ie8
+    if BROWSER_TYPE.ie7 or BROWSER_TYPE.ie8
       @_setOpacityIE( _id, _opacity)
     else
       @_elements[_id].style.setProperty('opacity', _opacity.toString(), '')
@@ -388,19 +387,6 @@ ELEM = HClass.extend
   setIdleDelay: (_idleDelay)->
     @_idleDelay = _idleDelay
     null
-  
-  ###
-  A flag that signals iefix (for IE6) if it needs to re-run or not
-  ###
-  _ieFixesNeeded: false
-
-  ###
-  Applies fixes for IE6
-  ###
-  _ieFixes: ->
-    iefix._traverseTree()
-    @_ieFixesNeeded = false
-    null
 
   ###
   Re-sets the flushLoop
@@ -425,7 +411,6 @@ ELEM = HClass.extend
   ###
   flushLoop: (_delay)->
     _delay = @_defaultDelay() unless _delay?
-    @_ieFixes() if BROWSER_TYPE.ie6 and @_ieFixesNeeded
     clearTimeout(@_timer)
     if @_flushing
       _delay *= 2
@@ -433,7 +418,6 @@ ELEM = HClass.extend
     else
       unless @_needFlush
         # go into 'sleep mode'
-        @_ieFixes() if BROWSER_TYPE.ie6 and @_ieFixesNeeded
         @_resetFlushLoop( _delay, @_idleDelay )
         return
       _delay = @_defaultDelay()
@@ -623,9 +607,6 @@ ELEM = HClass.extend
       _elem.style[@_camelize(_key)] = _value
     catch e
       console.log('ie setstyle error:'+_key+', '+_value+', '+e)
-    if BROWSER_TYPE.ie6
-      if ~iefix._traverseStyleProperties.indexOf(_key)
-        @_ieFixesNeeded = true
     null
 
   ###
@@ -635,7 +616,6 @@ ELEM = HClass.extend
     return null unless @_elements[_id]? # item is deleted
     if _id == undefined
       console.log('ERROR; undefined id in ELEM#setStyle(',_id, _key, _value, _noCache,')')
-    # _noCache = true if BROWSER_TYPE.ie9
     try
       _cached = @_styleCache[_id]
     catch e
@@ -768,14 +748,6 @@ ELEM = HClass.extend
       @_getComputedStyle = @_getComputedStyleIE
       @_setElementStyle = @_setElementStyleIE
     @bind( document.body ) unless @_timer
-    if BROWSER_TYPE.symbian
-      TestClass = HClass.extend({test:true, constructor:null})
-      # The Symbian JS implementation gets corrupted if the page is reloaded (loaded from cache), this tests that:
-      unless TestClass.test
-        if confirm('Your Web Browser fails. Please restart the S60 Web Browser or install a better browser.\nDo you want to download and install Opera Mobile now?')
-          location.href = 'http://www.opera.com/download/get.pl?sub=++++&id=32792&location=270&nothanks=yes'
-        # Can't do anything with such badly broken js engine
-        return
     @_flushDomLoadQueue() until @_initDone
     @_resetFlushLoop( @_minDelay )
     null
@@ -821,7 +793,7 @@ ELEM = HClass.extend
     return _steps
   _linearGradientStyle: (_gradient)->
     # IE6-8
-    if BROWSER_TYPE.ie and not BROWSER_TYPE.ie9 and not BROWSER_TYPE.ie10
+    if BROWSER_TYPE.ie7 or BROWSER_TYPE.ie8
       _key   = 'filter'
       _value = "progid:DXImageTransform.Microsoft.gradient( startColorstr='#{_gradient.start}', endColorstr='#{_gradient.end}',GradientType=0 )"
     # IE9
@@ -883,12 +855,12 @@ ELEM = HClass.extend
     _browserType = BROWSER_TYPE
     _browserType.opera    = !!~_ua.indexOf('Opera')
     _browserType.safari   = !!~_ua.indexOf('KHTML')
-    _browserType.symbian  = !!~_ua.indexOf('SymbianOS')
     _browserType.chrome   = !!~_ua.indexOf('Chrome')
     _isIE = document.all and not _browserType.opera
     if _isIE
       _browserType.ie  = _isIE
       _browserType.ie6 = !!~_ua.indexOf('MSIE 6')
+      location.href = 'http://www.ie6nomore.com' if _browserType.ie6
       _browserType.ie7 = !!~_ua.indexOf('MSIE 7')
       _browserType.ie8 = !!~_ua.indexOf('MSIE 8')
       _browserType.ie9 = !!~_ua.indexOf('MSIE 9')
@@ -924,7 +896,7 @@ ELEM = HClass.extend
   Checks if the document is fully loaded
   ###
   _domWaiter: ->
-    if BROWSER_TYPE.ie6 or BROWSER_TYPE.ie7 or BROWSER_TYPE.ie8
+    if BROWSER_TYPE.ie7 or BROWSER_TYPE.ie8
       if location.protocol == 'https:'
         _ie_proto = 'src=//0'
       else
@@ -947,7 +919,6 @@ ELEM = HClass.extend
     
     if ELEM._domLoadStatus
       clearTimeout( @_domLoadTimer )
-      BROWSER_TYPE.symbian = document.body.innerHTML == 'fastinnerhtml!' if BROWSER_TYPE.symbian
       @_init()
     else
       ELEM._domLoadTimer = setTimeout( =>

data/js/core/util/util_methods/util_methods.coffee

@@ -116,7 +116,7 @@ UtilMethods = (->
     ]
     # Returns a quoted string (escapes quotation marks and places quotes within)
     _quoteString: (_str)->
-      for _substitution in @_stringSubstritutions
+      for _substitution in @_stringSubstitutions
         [ _substFrom, _substTo ] = _substitution
         _str = _str.replace( _substFrom, _substTo )
       '"'+_str+'"'
@@ -227,7 +227,7 @@ UtilMethods = (->
       encodeObject: (_obj)->
         return 'null' unless _obj?
         _type = @typeChr(_obj)
-        unless _obj
+        unless _type
           console.log 'WARNING: encode of '+(typeof _obj)+' not possible'
           return 'null'
         return String(_obj) if _type == 'b' or _type == 'n'
@@ -272,7 +272,7 @@ UtilMethods = (->
               _cloned[_key] = _value
           else
             for _key, _value of _obj
-              _cloned[_key] = @cloneObject( _item )
+              _cloned[_key] = @cloneObject( _value )
           return _cloned
         _obj
   for _methodName, _methodValue of _encodeDecodeMethods

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

@@ -9,12 +9,12 @@
   <div class="calendar_s"></div>
   <div class="calendar_se"></div>
 </div>
-<div class="calendar_control" id="control#{_ID}">
+<div class="calendar_control" id="control]I[">
   <div class="calendar_head">
-    <div class="calendar_head_prev_month" id="prevMonth#{_ID}"></div>
-    <div class="calender_head_month_year" id="state#{_ID}"></div>
-    <div class="calendar_head_next_month" id="nextMonth#{_ID}"></div>
+    <div class="calendar_head_prev_month" id="prevMonth]I["></div>
+    <div class="calender_head_month_year" id="state]I["></div>
+    <div class="calendar_head_next_month" id="nextMonth]I["></div>
   </div>
-  <div class="calendar_weekdays" id="label#{_ID}"></div>
-  <div class="calendar_weeks" id="value#{_ID}"></div>
-</div>
+  <div class="calendar_weekdays" id="label]I["></div>
+  <div class="calendar_weeks" id="value]I["></div>
+</div>

data/js/datetime/calendar_pulldown/themes/default/calendar_pulldown.html

@@ -1 +1 @@
-<div class="calendar_pulldown" id="control#{_ID}"><span id="label#{_ID}"></span></div>
+<div class="calendar_pulldown" id="control]I["><span id="label]I["></span></div>

data/js/datetime/timesheet/themes/default/timesheet.html

@@ -1,4 +1,4 @@
-<div id="label#{_ID}" class="timesheet_label"></div>
-<div id="timeline#{_ID}" class="timesheet_timeline"></div>
-<div id="value#{_ID}" class="timesheet_items"></div>
-${this.themeSettings(30, 20, 0, 10, -6);}
+<div id="label]I[" class="timesheet_label"></div>
+<div id="timeline]I[" class="timesheet_timeline"></div>
+<div id="value]I[" class="timesheet_items"></div>
+${this.themeSettings(30, 20, 0, 10, -6);}

data/js/datetime/timesheet/timesheet.js

@@ -40,6 +40,7 @@ HTimeSheet = HControl.extend({
     itemOffsetBottom: 0,  // Theme settings; don't enter in options
     itemDisplayTime: true,
     allowClickCreate: false,
+    iconImage: 'timesheet_item_icons.png',
     allowDoubleClickCreate: true,
     minDragSize: 5,       // minimum amount of pixels dragged required for accepting a drag
     hourOffsetTop: -4,    // Theme settings; don't enter in options
@@ -234,6 +235,7 @@ HTimeSheet = HControl.extend({
       this, {
         value: _dummyValue,
         visible: false,
+        iconImage: this.options.iconImage,
         displayTime: this.options.itemDisplayTime
       }
     );

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

@@ -63,7 +63,6 @@
   position: absolute;
   top: 0px; width: 16px; height: 16px;
   background-position: 0px 0px;
-  background-image: url(#{this.getThemeGfxFile('/timesheet_item_icons.png')});
 }
 
 .locked .timesheet_item_move,

data/js/datetime/timesheet_item/themes/default/timesheet_item.html

@@ -1,10 +1,10 @@
-<div class="timesheet_item" id="bg#{_ID}">
-  <div class="timesheet_item_time" id="state#{_ID}"></div>
+<div class="timesheet_item" id="bg]I[">
+  <div class="timesheet_item_time" id="state]I["></div>
   <div class="timesheet_item_middle">
-    <div class="timesheet_item_label" id="label#{_ID}">#{this.label}</div>
+    <div class="timesheet_item_label" id="label]I[">#{this.label}</div>
   </div>
-  <div class="timesheet_item_icons" id="icons#{_ID}"></div>
+  <div class="timesheet_item_icons" id="icons]I["></div>
   <div class="timesheet_item_resize_top"></div>
   <div class="timesheet_item_resize_bottom"></div>
-  <div class="timesheet_item_move" id="subview#{_ID}"></div>
+  <div class="timesheet_item_move" id="subview]I["></div>
 </div>

data/js/datetime/timesheet_item/timesheet_item.js

@@ -9,15 +9,20 @@ HTimeSheetItem = HControl.extend({
   markupElemNames: ['bg', 'label', 'state', 'icons', 'value', 'subview'],
   
   controlDefaults: HControlDefaults.extend({
-    displayTime: true
+    displayTime: true,
+    iconImage: 'timesheet_item_icons.png'
   }),
   
   drawIcon: function( _iconOrder, _iconId ){
     var
-    _iconElemId = ELEM.make( this.markupElemIds.icons, 'div' );
+    _iconElemId = ELEM.make( this.markupElemIds.icons, 'div' ),
+    _iconUrl = this.getThemeGfxFile(this.options.iconImage);
     ELEM.addClassName( _iconElemId, 'timesheet_item_icon' );
-    ELEM.setStyle( _iconElemId, 'right', ((_iconOrder*16)+_iconOrder)+'px' );
-    ELEM.setStyle( _iconElemId, 'background-position', '0px '+(_iconId*-16)+'px' );
+    ELEM.setStyles( _iconElemId, {
+      right: ((_iconOrder*16)+_iconOrder)+'px',
+      backgroundPosition: '0px '+(_iconId*-16)+'px',
+      backgroundImage: 'url('+_iconUrl+')'
+    } );
     return _iconElemId;
   },
   
@@ -194,7 +199,7 @@ HTimeSheetItem = HControl.extend({
       _startChanged = ( this.dragTimeStart !== this.originTimeStart ) && ( this.dragTimeStart !== this.value.start ),
       _durationChanged = ( this.dragDuration !== this.originDuration ) && ( this.dragDuration !== this.value.duration );
       if( _startChanged || _durationChanged ){
-        if( this.parent['editor'] ){
+        if( this.parent.editor ){
           var _modValue = { id: this.value.id, start: this.dragTimeStart, duration: this.dragDuration, label: this.value.label };
           this.parent.editor.modifyItem( _modValue );
         }

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

@@ -1,4 +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 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>

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

@@ -1,7 +1,7 @@
-<div class="minimenu_control" id="control#{_ID}">
+<div class="minimenu_control" id="control]I[">
   <div class="minimenu_edge_left"></div>
   <div class="minimenu_center"></div>
   <div class="minimenu_edge_right"></div>
-  <div class="minimenu_label" id="label#{_ID}">#{this.label}</div>
+  <div class="minimenu_label" id="label]I[">#{this.label}</div>
   <div class="minimenu_antiselect"></div>
 </div>

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

@@ -1,4 +1,4 @@
-<div class="minimenuitem_control#{this.value?' checked':' unchecked'}" id="control#{_ID}">
-  <div class="minimenuitem_state" id="state#{_ID}"></div>
-  <div class="minimenuitem_label" id="label#{_ID}">#{this.label}</div>
+<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>

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

@@ -43,7 +43,7 @@
 
 .popupmenu_label {
   left: 13px; right: 11px; top: 0px;
-  height: 22px; line-height: #{(BROWSER_TYPE.ie7||BROWSER_TYPE.ie6)?'20':'22'}px;
+  height: 22px;
   text-align: left;
   text-overflow: ellipsis;
   overflow: hidden;
@@ -52,6 +52,7 @@
   font-family: Arial, sans-serif;
   font-size: 12px;
   color: #333;
+  line-height: #{BROWSER_TYPE.ie7?'20':'22'}px;
 }
 .popupmenu_control:hover > .popupmenu_label {
   color: #000;