rsence 2.0.0.pre → 2.0.0.1.pre

data/js/comm/comm/values/values.js

@@ -364,7 +364,7 @@ COMM.Values = HClass.extend({
   * A copy of the object.
   *
   **/
-  clone: function( _obj ){
+  clone: function( _obj, _shallow ){
     if(_obj === null || _obj === undefined){
       console.log('null or undefined obj:',_obj);
       return _obj;
@@ -374,14 +374,24 @@ COMM.Values = HClass.extend({
     if( _obj instanceof Array ){
       _cloned = [];
       for( _item = 0; _item < _obj.length; _item ++ ){
-        _cloned[ _item ] = this.clone( _obj[ _item ] );
+        if(_shallow){
+          _cloned[ _item ] = _obj[ _item ];
+        }
+        else {
+          _cloned[ _item ] = this.clone( _obj[ _item ] );
+        }
       }
       return _cloned;
     }
     else if( _obj instanceof Object ){
       _cloned = {};
       for( _item in _obj ){
-        _cloned[ _item ] = this.clone( _obj[ _item ] );
+        if(_shallow){
+          _cloned[ _item ] = _obj[ _item ];
+        }
+        else {
+          _cloned[ _item ] = this.clone( _obj[ _item ] );
+        }
       }
       return _cloned;
     }

data/js/comm/jsloader/jsloader.js

@@ -13,6 +13,7 @@
   ** Use the jsLoader instance to get packaged Javascript libraries from the
   ** standard package url.
 ***/
+
 COMM.JSLoader = HClass.extend({
   
 /** = Description
@@ -49,16 +50,23 @@ COMM.JSLoader = HClass.extend({
   *
   **/
   load: function(_jsName){
-    var _this = this;
-    if((_this._loadedJS.indexOf(_jsName)!==-1)) {
+    var _this = this,
+        _isFullUrl = _jsName.slice(0,7) === 'http://' || _jsName.slice(0,8) === 'https://',
+        _url = _isFullUrl?_jsName:_this.uri+_jsName+'.js';
+    if((_this._loadedJS.indexOf(_url)!==-1)) {
       return;
     }
     COMM.Queue.pause();
-    _this._loadedJS.push(_jsName);
-    if(BROWSER_TYPE.ie || BROWSER_TYPE.symbian){
+    _this._loadedJS.push(_url);
+    if(BROWSER_TYPE.symbian && _isFullUrl){
+      alert('Sorry, this browser does not support loading external scripts!');
+      return;
+    }
+    else if(BROWSER_TYPE.symbian){
       _this._req = COMM.request(
-        _this.uri+_jsName+'.js', {
+        _url, {
           onSuccess: function(_resp){
+            _this._req = null;
             COMM.Queue.unshiftEval(_resp.X.responseText);
             COMM.Queue.resume();
           },
@@ -67,17 +75,26 @@ COMM.JSLoader = HClass.extend({
           async: true
         }
       );
+      return;
+    }
+    var _script = document.createElement('script');
+    if(BROWSER_TYPE.ie){
+      _script.onreadystatechange = function(){
+        if(this.readyState === 'loaded' || this.readyState === 'complete'){
+          COMM.Queue.resume();
+          _script.onload = _script.readystatechange = null;
+        }
+      };
     }
     else {
-      // The following doesn't always work reliably on Internet Explorer:
-      var _script = document.createElement('script');
-      _script.onload = function(){COMM.Queue.resume();};
-      _script.src = _this.uri+_jsName+'.js';
-      _script.type = 'text/javascript';
-      document.getElementsByTagName('head')[0].appendChild(_script);
+      _script.onload = function(){
+        COMM.Queue.resume();
+      };
     }
+    _script.src = _url;
+    _script.type = 'text/javascript';
+    document.getElementsByTagName('head')[0].appendChild(_script);
   }
-  
 });
 
 /** -- Global reference ++ **/

data/js/controls/datetime/timesheet/timesheet.js

@@ -47,7 +47,7 @@ HTimeSheet = HControl.extend({
     for(; hour < 24; hour++){
       hours.push('<div style="line-height:'+rowHeight+'px;height:'+rowHeight+'px;top:'+Math.round((hour*rowHeight)-lineHeight)+'px" class="timesheet_hours_row">'+hour+':00</div>');
     }
-    ELEM.setHTML(this.markupElemIds.label,hours.join(''));
+    this.markupElemIds && this.markupElemIds.label && ELEM.setHTML(this.markupElemIds.label,hours.join(''));
     this.refreshState();
   },
   
@@ -62,7 +62,7 @@ HTimeSheet = HControl.extend({
     for(; line < 48; line++){
       lines.push('<div style="top:'+(line*lineHeight)+'px" class="timesheet_lines_row'+(line%2)+'"></div>');
     }
-    ELEM.setHTML(this.markupElemIds.state,lines.join(''));
+    this.markupElemIds && this.markupElemIds.label && ELEM.setHTML(this.markupElemIds.state,lines.join(''));
   },
   dragItem: false,
   

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

@@ -11,7 +11,7 @@
 <div class="textcontrol_sw"></div>
 
 <div id="label#{_ID}" title="#{this.label}" class="textcontrol_input_parent">
-  <input type="password" class="textcontrol_input" 
+  <input type="password" class="textcontrol_input" #{this.enabled?'':'disabled'}
     onfocus="HSystem.views[#{this.viewId}].textFocus();" 
     onblur="HSystem.views[#{this.viewId}].textBlur();" 
     id="value#{_ID}" value="#{this.value}" />

data/js/controls/sliders/slider/themes/default/slider.css

@@ -3,6 +3,7 @@
 .hslider_track {
   position: absolute;
   height: 7px; top: 7px;
+  font-size: 0px;
   background-image: #{this.getCssFilePath('hslider_tracks.png')};
 }
 
@@ -36,6 +37,7 @@
 .hslider_thumb {
   position: absolute;
   top: 0px; height: 21px; width: 21px;
+  font-size: 0px;
   background-position: 0px 0px;
   background-image: #{this.getCssFilePath('slider_thumbs.png')};
 }

data/js/controls/sliders/vslider/themes/default/vslider.css

@@ -3,6 +3,7 @@
 .vslider_track {
   position: absolute;
   width: 7px; left: 7px;
+  font-size: 0px;
   background-image: #{this.getCssFilePath('vslider_tracks.png')};
 }
 
@@ -35,6 +36,7 @@
 
 .vslider_thumb {
   position: absolute;
+  font-size: 0px;
   left: 0px; width: 21px; height: 21px;
   background-position: 0px 0px;
   background-image: #{this.getCssFilePath('slider_thumbs.png')};

data/js/controls/tab/tab.js

@@ -41,10 +41,6 @@ HTab = HControl.extend({
   refreshOnValueChange: true,
   refreshOnLabelChange: false,
   
-  defaultEvents: {
-    click: true
-  },
-  
   controlDefaults: (HControlDefaults.extend({
     constructor: function(_ctrl){
       this.tabInit(_ctrl);
@@ -79,7 +75,7 @@ HTab = HControl.extend({
   tabLabelElementTagName: 'div',
   tabLabelAlign: 'left',
   tabLabelFillBg: false,
-  tabTriggerLink: false,
+  tabTriggerLink: true,
   tabLabelNoHTMLPrefix: false,
   
 /** = Description
@@ -170,7 +166,7 @@ HTab = HControl.extend({
       ELEM.setAttr(_tabLabelElemId,'href','javascript:HSystem.views['+this.viewId+'].selectTab('+_tabIdx+');');
     }
     else if (this.tabTriggerLink){
-      ELEM.setAttr(_tabLabelElemId,'mouseup','HSystem.views['+this.viewId+'].selectTab('+_tabIdx+');');
+      ELEM.setAttr(_tabLabelElemId,'onclick','HSystem.views['+this.viewId+'].selectTab('+_tabIdx+');');
     }
     else {
       this.tabLabelBounds.push([this.rightmostPx,this.rightmostPx+_labelWidth]);

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

@@ -54,6 +54,7 @@
   text-align: center;
   color: #000;
   line-height: 26px;
+  overflow: hidden;
   text-align: center; vertical-align: middle;
   font-family: Arial, sans-serif;
   font-size: 12px; font-weight: bold;

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

@@ -3,4 +3,4 @@
 </div>
 <div class="tab_label" id="label#{_ID}"></div>
 <div class="tab_label_fill_bg" id="state#{_ID}"></div>
-${this.tabLabelLeftEdge=12;this.tabLabelRightEdge=9;this.tabLabelHeight=24;this.fontStyle='font-size: 12px; font-weight: bold;';this.tabLabelFillBg=true;}
+${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;}

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

@@ -0,0 +1,21 @@
+.default .textarea_input {
+  position: absolute;
+  display: block;
+  font-family: Arial, sans-serif;
+  font-size: 13px;
+  color: #000;
+  background-color: transparent;
+  vertical-align: middle;
+  border: 0;
+  left:0px;top:0px;
+  #{(BROWSER_TYPE.firefox||BROWSER_TYPE.ie7||BROWSER_TYPE.ie8||BROWSER_TYPE.opera)?'padding:0;padding-left:2px;width:100% !important;height:100% !important;':BROWSER_TYPE.ie6?'right:2px;bottom:2px;':'padding:2px;right:0px;bottom:0px;width:auto;height:auto;'}
+}
+
+.default .disabled .textarea_input {
+  #{(BROWSER_TYPE.safari||BROWSER_TYPE.chrome)?'color:#ccc;':'color:#999'}
+}
+
+.default .textarea_input_parent {
+  position: absolute;
+  #{(BROWSER_TYPE.firefox||BROWSER_TYPE.ie7||BROWSER_TYPE.ie8||BROWSER_TYPE.opera)?'left:0;padding-left:1px;top:1px;right:3px;bottom:1px;':BROWSER_TYPE.ie?'left:2px;top:1px;right:1px;bottom:1px;':'left:-2px;top:-2px;right:-2px;bottom:-2px;'}
+}

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

@@ -10,8 +10,8 @@
 <div class="textcontrol_se"></div>
 <div class="textcontrol_sw"></div>
 
-<div id="label#{_ID}" title="#{this.label}" class="textcontrol_input_parent">
-  <textarea class="textcontrol_input" style="resize:none;"
+<div id="label#{_ID}" 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>

data/js/controls/textcontrol/textcontrol.js

@@ -21,8 +21,7 @@ HTextControl = HControl.extend({
   componentName: "textcontrol",
   
   defaultEvents: {
-    textEnter: true,
-    mouseWheel: true
+    textEnter: true
   },
   
   controlDefaults: (HControlDefaults.extend({
@@ -43,71 +42,55 @@ HTextControl = HControl.extend({
     }
   },
 
-/** = Description
-  * Tweaks the input element to fit the match the size properly
-  * in different browsers. Can't be done reliably by using just
-  * the theme css, because some browsers are broken
-  * regarding styling of input elements.
-  *
-  **/
-  drawSubviews: function(){
-    if(this['markupElemIds']!==undefined){
-      if(this.markupElemIds['label']!==undefined) {
-        var _input  = this.markupElemIds.value,
-            _label  = this.markupElemIds.label;
-        if(BROWSER_TYPE.firefox){
-          if(this.componentName === 'textarea'){
-            ELEM.setStyle(_input,'padding-top','0px');
-          }
-          else {
-            ELEM.setStyle(_input,'margin-top','1px');
-          }
-          ELEM.setStyle(_input,'padding-left','0px');
-          ELEM.setStyle(_label,'left','2px');
-          ELEM.setStyle(_label,'top','0px');
-          ELEM.setStyle(_label,'right','2px');
-          ELEM.setStyle(_label,'bottom','2px');
-        }
-        else if(BROWSER_TYPE.ie){
-          ELEM.flushLoop();
-          var _size   = ELEM.getVisibleSize( this.elemId ),
-              _width  = _size[0],
-              _height = _size[1];
-          ELEM.setStyle(_input,'left','2px');
-          ELEM.setStyle(_input,'top','1px');
-          ELEM.setStyle(_input,'padding-top','0px');
-          ELEM.setStyle(_input,'padding-left','0px');
-          ELEM.setStyle(_input,'padding-right','8px');
-          ELEM.setStyle(_input,'padding-bottom','0px');
-          ELEM.setStyle(_input,'width',(_width-10)+'px');
-          ELEM.setStyle(_input,'height',(_height-2)+'px');
-          ELEM.setStyle(_label,'left','0px');
-          ELEM.setStyle(_label,'top','0px');
-          ELEM.setStyle(_label,'right','0px');
-          ELEM.setStyle(_label,'bottom','0px');
-        }
-        else if(BROWSER_TYPE.safari||BROWSER_TYPE.chrome){
-          ELEM.setStyle(_input,'width','auto');
-          ELEM.setStyle(_input,'height','auto');
-          ELEM.setStyle(_input,'left','-2px');
-          ELEM.setStyle(_input,'top','-2px');
-          if (BROWSER_TYPE.chrome) {
-            ELEM.setStyle(_input,'right','0px');
-            ELEM.setStyle(_input,'bottom','0px');
-          }
-          else {
-            ELEM.setStyle(_input,'right','-2px');
-            ELEM.setStyle(_input,'bottom','-2px');
-          }
-          ELEM.setStyle(_label,'left','0px');
-          ELEM.setStyle(_label,'top','0px');
-          ELEM.setStyle(_label,'right','0px');
-          ELEM.setStyle(_label,'bottom','0px');
-        }
-      }
-    }
-    this.setEnabled(this.enabled);
-  },
+//   drawSubviews: function(){
+//     if(this['markupElemIds']!==undefined && this.markupElemIds['value']!==undefined) {
+//       // this.adjustInputStyle();
+//     }
+//     this.setEnabled(this.enabled);
+//   },
+//   
+// /** = Description
+//   * Tweaks the input element to fit the match the size properly
+//   * in different browsers. Can't be done reliably by using just
+//   * the theme css, because some browsers are broken
+//   * regarding styling of input elements.
+//   *
+//   **/
+//   adjustInputStyle: function(){
+//     var _input  = this.markupElemIds.value,
+//         _label  = this.markupElemIds.label;
+//     if(BROWSER_TYPE.firefox){
+//       if(this.componentName === 'textarea'){
+//         ELEM.setStyle(_input,'padding-top','0px');
+//       }
+//       else {
+//         ELEM.setStyle(_input,'margin-top','1px');
+//       }
+//       ELEM.setStyle(_input,'padding-left','0px');
+//       ELEM.setStyle(_label,'left','2px');
+//       ELEM.setStyle(_label,'top','0px');
+//       ELEM.setStyle(_label,'right','2px');
+//       ELEM.setStyle(_label,'bottom','2px');
+//     }
+//     else if(BROWSER_TYPE.ie){
+//       ELEM.flushLoop();
+//       var _size   = ELEM.getVisibleSize( this.elemId ),
+//           _width  = _size[0],
+//           _height = _size[1];
+//       ELEM.setStyle(_input,'left','2px');
+//       ELEM.setStyle(_input,'top','1px');
+//       ELEM.setStyle(_input,'padding-top','0px');
+//       ELEM.setStyle(_input,'padding-left','0px');
+//       ELEM.setStyle(_input,'padding-right','8px');
+//       ELEM.setStyle(_input,'padding-bottom','0px');
+//       ELEM.setStyle(_input,'width',(_width-10)+'px');
+//       ELEM.setStyle(_input,'height',(_height-2)+'px');
+//       ELEM.setStyle(_label,'left','0px');
+//       ELEM.setStyle(_label,'top','0px');
+//       ELEM.setStyle(_label,'right','0px');
+//       ELEM.setStyle(_label,'bottom','0px');
+//     }
+//   },
   
   setStyle: function(_name, _value, _cacheOverride) {
     if (!this['markupElemIds']||!this.markupElemIds['value']) {
@@ -118,8 +101,7 @@ HTextControl = HControl.extend({
   
   setEnabled: function(_flag) {
     this.base(_flag);
-    if(this['markupElemIds']===undefined){return;}
-    if(this.markupElemIds.value) {
+    if(this['markupElemIds'] && this.markupElemIds.value) {
       ELEM.get(this.markupElemIds.value).disabled = !this.enabled;
     }
   },
@@ -347,6 +329,11 @@ HTextControl = HControl.extend({
   **/
 HNumericTextControl = HTextControl.extend({
   
+  defaultEvents: {
+    mouseWheel: true,
+    textEnter: true
+  },
+  
 /** Uses the mouseWheel event to step up/down the value.
   **/
   mouseWheel: function(_delta){

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

@@ -1,29 +1,27 @@
 
-.textcontrol_input {
+.default .textcontrol_input {
   position: absolute;
   display: block;
-  left: 0px; top: 0px; width: 100%; height: 100%;
   font-family: Arial, sans-serif;
   font-size: 13px;
   color: #000;
   background-color: transparent;
   vertical-align: middle;
-  padding-left: 4px;
-  padding-top: 2px;
   border: 0px;
+  left: 0px; top: 0px;
+  #{(BROWSER_TYPE.firefox||BROWSER_TYPE.ie7||BROWSER_TYPE.ie8||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;'}
 }
 
-.disabled .textcontrol_input {
+.default .disabled .textcontrol_input {
   color: #999;
 }
 
-.textcontrol_input_parent {
+.default .textcontrol_input_parent {
   position: absolute;
-  left: -2px; top: -2px;
-  right: -2px; bottom: -2px;
+  #{(BROWSER_TYPE.firefox||BROWSER_TYPE.ie7||BROWSER_TYPE.ie8||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;'}
 }
 
-.textcontrol_bg {
+.default .textcontrol_bg {
   position: absolute;
   left: 2px; top: 2px; right: 2px; bottom: 2px;
   background-color: #fff;
@@ -32,7 +30,10 @@
 
 
 
-.textcontrol_ne, .textcontrol_nw, .textcontrol_se, .textcontrol_sw {
+.default .textcontrol_ne,
+.default .textcontrol_nw,
+.default .textcontrol_se,
+.default .textcontrol_sw {
   position: absolute;
   width: 7px; height: 7px;
   background-repeat: no-repeat;
@@ -40,29 +41,30 @@
   #{BROWSER_TYPE.ie6?'font-size:0;line-height:0;':''}
 }
 
-.textcontrol_nw {
+.default .textcontrol_nw {
   left: 0px; top: 0px;
   background-position: 0px 0px;
 }
 
-.textcontrol_ne {
+.default .textcontrol_ne {
   right: 0px; top: 0px;
   background-position: -7px 0px;
 }
 
-.textcontrol_sw {
+.default .textcontrol_sw {
   left: 0px; bottom: 0px;
   background-position: 0px -7px;
 }
 
-.textcontrol_se {
+.default .textcontrol_se {
   right: 0px; bottom: 0px;
   background-position: -7px -7px;
 }
 
 
 
-.textcontrol_w, .textcontrol_e {
+.default .textcontrol_w,
+.default .textcontrol_e {
   position: absolute;
   width: 7px; top: 7px; bottom: 7px;
   background-repeat: repeat-y;
@@ -70,19 +72,20 @@
   #{BROWSER_TYPE.ie6?'font-size:0;line-height:0;':''}
 }
 
-.textcontrol_w {
+.default .textcontrol_w {
   left: 0px;
   background-position: 0px 0px;
 }
 
-.textcontrol_e {
+.default .textcontrol_e {
   right: 0px;
   background-position: -7px 0px;
 }
 
 
 
-.textcontrol_n, .textcontrol_s {
+.default .textcontrol_n,
+.default .textcontrol_s {
   position: absolute;
   height: 7px; left: 7px; right: 7px;
   background-repeat: repeat-x;
@@ -90,12 +93,12 @@
   #{BROWSER_TYPE.ie6?'font-size:0;line-height:0;':''}
 }
 
-.textcontrol_n {
+.default .textcontrol_n {
   top: 0px;
   background-position: 0px 0px;
 }
 
-.textcontrol_s {
+.default .textcontrol_s {
   bottom: 0px;
   background-position: 0px -7px;
 }