rsence 2.0.0.pre → 2.0.0.1.pre

data/js/core/event/event.js

@@ -46,7 +46,7 @@ Event = {
   **/
   isLeftClick: function(e) {
     // IE: left 1, middle 4, right 2
-    if (ELEM._is_ie || ELEM._is_safari) {
+    if (BROWSER_TYPE.ie || BROWSER_TYPE.safari) {
       return (e.button === 1);
     }
     else {
@@ -141,7 +141,7 @@ Event = {
 
 // Activates the garbage collector of Internet Explorer 
 // when the document is unloaded:
-if (ELEM._is_ie) {
+if (BROWSER_TYPE.ie) {
   Event.observe(window, "unload", Event.unloadCache, false);
 }
 
@@ -262,24 +262,24 @@ EVENT = {
 /** Starts event listening.
   **/
   start: function() {
-    var _globalEventTargetElement = ELEM._is_ie?document:window,
-        _this = EVENT,
-        _eventMap = [
-          ['mousemove', _this.mouseMove],
-          ['mouseup', _this.mouseUp],
-          ['mousedown', _this.mouseDown],
-          ['click', _this.click],
-          ['keyup', _this.keyUp],
-          ['keydown', _this.keyDown],
-          ['keypress', _this.keyPress],
-          ['contextmenu', _this.contextMenu],
-          ['resize', _this.resize],
-          ['mousewheel', _this.mouseWheel]
-        ],
-        i = 0;
-    for (; i !== _eventMap.length; i++) {
-      Event.observe(_globalEventTargetElement, _eventMap[i][0], _eventMap[i][1]);
-    }
+    var _globalEventTargetElement = BROWSER_TYPE.ie?document:window,
+        _this = EVENT;
+        // _eventMap = [
+    Event.observe( _globalEventTargetElement, 'mousemove', _this.mouseMove );
+    Event.observe( _globalEventTargetElement, 'mouseup', _this.mouseUp );
+    Event.observe( _globalEventTargetElement, 'mousedown', _this.mouseDown );
+    Event.observe( _globalEventTargetElement, 'click', _this.click );
+    Event.observe( _globalEventTargetElement, 'keyup', _this.keyUp );
+    Event.observe( _globalEventTargetElement, 'keydown', _this.keyDown );
+    Event.observe( _globalEventTargetElement, 'keypress', _this.keyPress );
+    Event.observe( _globalEventTargetElement, 'contextmenu', _this.contextMenu );
+    Event.observe( _globalEventTargetElement, 'resize', _this.resize );
+    Event.observe( _globalEventTargetElement, 'mousewheel', _this.mouseWheel );
+        // ],
+        // i = 0;
+    // for (; i !== _eventMap.length; i++) {
+    // Event.observe(_globalEventTargetElement, _eventMap[i][0], _eventMap[i][1]);
+    // }
     if (window.addEventListener) {
       window.addEventListener('DOMMouseScroll', EVENT.mouseWheel, false);
       window.addEventListener('resize', EVENT.resize, false);
@@ -338,7 +338,7 @@ EVENT = {
     // Binds the class to the element (so it can be called on the event)
     _elemId = _ctrl.elemId;
     _elem = ELEM.get(_elemId);
-    if (ELEM._is_ie) {
+    if (BROWSER_TYPE.ie) {
       _elem.setAttribute('ctrl', _ctrl);
     }
     else {
@@ -380,16 +380,24 @@ EVENT = {
   **/
   unreg: function(_ctrl) {
     var _this = EVENT,
-    _elemId,
-    _elem;
+        _elemId,
+        _elem;
     if (_ctrl === this.activeControl) {
       _this.changeActiveControl(null);
     }
     _elemId = _ctrl.elemId;
     _elem = ELEM.get(_elemId);
-    this.listeners[_elemId] = false;
-    this.focused[_elemId] = false;
-    this._coordCache[_elemId] = null;
+    
+    _this._coordCache[_elemId] = null;
+    
+    _this.listeners[_elemId] = false;
+    _this.focused[_elemId] = false;
+    _this.focusOptions[_elemId] = { ctrl: _ctrl };
+    var _coordListenIdx = _this.coordListeners.indexOf(_elemId);
+    if (_coordListenIdx !== -1) {
+      _this.coordListeners.splice(_coordListenIdx, 1);
+    }
+    
     var _textEnterIndex = _this.textEnterCtrls.indexOf(_ctrl.viewId);
     if (_textEnterIndex !== -1) {
       _this.textEnterCtrls.splice(_textEnterIndex, 1);

data/js/core/iefix/iefix.js

@@ -41,13 +41,17 @@ iefix = {
   // finds the next parent with fixed or absolute positioning:
   // NOTICE: .init() makes ._layoutHeight() from this by replacing width with height
   layoutWidth: function(_element) {
-    var _this=iefix,_parent,i=0,
+    var _this=iefix,
+        _parent,
+        i=0,
         // gets the parent from which the width is calculated
         _layoutParent=_element.offsetParent;
     while(_layoutParent&&!_this._hasLayout(_layoutParent)){
       _layoutParent=_layoutParent.offsetParent;
     }
-    if(!_layoutParent._resizewidthElements){_layoutParent._resizewidthElements=[];}
+    if(!_layoutParent._resizewidthElements){
+      _layoutParent._resizewidthElements=[];
+    }
     if(!_element._addedResizewidthFix){
       _layoutParent._resizewidthElements.push(_element);
       _parent=_layoutParent;
@@ -71,11 +75,11 @@ iefix = {
     return (_layoutParent||document.documentElement).clientWidth;
   },
   
-  // calculates the border width of the _element:
-  // NOTICE: .init() makes ._getBorderHeight() from this by replacing Width with Height
-  getBorderWidth: function(_element){
-    return _element.offsetWidth-_element.clientWidth;
-  },
+  // // calculates the border width of the _element:
+  // // NOTICE: .init() makes ._getBorderHeight() from this by replacing Width with Height
+  // getBorderWidth: function(_element){
+  //   return _element.offsetWidth-_element.clientWidth;
+  // },
   
   // calculates the actual value in pixels from _value:
   getPixelValue: function(_element,_value) {
@@ -103,13 +107,13 @@ iefix = {
     return _this.getPixelValue(_element, _value);
   },
   
-  // calculates padding width of the _element:
-  // NOTICE: .init() makes .getPaddingHeight() from this by replacing Left/Right/Width with Top/Bottom/Height
-  // NOTICE: .init() also makes ._getMarginWidth() and ._getMarginHeight from this.
-  getPaddingWidth: function(_element) {
-    var _this=iefix;
-    return _this.getPixelWidth(_element,_element.currentStyle.paddingLeft)+_this.getPixelWidth(_element,_element.currentStyle.paddingRight);
-  },
+  // // calculates padding width of the _element:
+  // // NOTICE: .init() makes .getPaddingHeight() from this by replacing Left/Right/Width with Top/Bottom/Height
+  // // NOTICE: .init() also makes ._getMarginWidth() and ._getMarginHeight from this.
+  // getPaddingWidth: function(_element) {
+  //   var _this=iefix;
+  //   return _this.getPixelWidth(_element,_element.currentStyle.paddingLeft)+_this.getPixelWidth(_element,_element.currentStyle.paddingRight);
+  // },
   
   // calculates element's position from the right edge of the parent:
   // NOTICE: .init() makes _resizeBottom() from this by replacing left/width with top/height
@@ -122,7 +126,8 @@ iefix = {
     if(parseInt(_element.runtimeStyle.width,10)===_width){return;}
     _element.runtimeStyle.width="";
     if(_element.offsetWidth<_width){
-      _width-=_this.getBorderWidth(_element)+_this.getPaddingWidth(_element);
+      // Disabled, because no-one uses quirks mode anymore, right?
+      // _width-=_this.getBorderWidth(_element)+_this.getPaddingWidth(_element);
       if(_width<0){_width=0;}
       _element.runtimeStyle.width=_width;
     }
@@ -185,29 +190,39 @@ iefix = {
     }
   },
   
-  _noStyleTagNames: ['PARAM'],
+  _noStyleTagNames: ['PARAM','HTML'],
   // applies fixes to the _element
   inlineStyleChanged: function(_element){
-    var _this=iefix,_currentStyle;
-    _currentStyle=_element.currentStyle;
-    if(_this._noStyleTagNames.indexOf(_element.tagName)!==-1){ return; }
+    var _this=iefix,
+        _currentStyle=_element.currentStyle;
+    if(_this._noStyleTagNames.indexOf(_element.tagName)!==-1){
+      return;
+    }
     // check if element needs to be positioned from the right
     try{
-      if((_currentStyle.position==="absolute"||_currentStyle.position==="fixed")&&_currentStyle.left!=="auto"&&_currentStyle.right!=="auto"&&_currentStyle.width==="auto"){
+      var _posMatch = (_currentStyle.position==="absolute"||_currentStyle.position==="fixed"),
+          _resizeWidth = _element._resizewidth,
+          _resizeHeight = _element._resizeheight,
+          _autoRight = _currentStyle.right==="auto",
+          _autoBottom = _currentStyle.bottom==="auto";
+      if(_resizeWidth||(_posMatch&&!_autoRight)){
         _this.resizeRight(_element);
       }
-    
     // check if element needs to be positioned from the bottom
-      if((_currentStyle.position==="absolute"||_currentStyle.position==="fixed")&&_currentStyle.top!=="auto"&&_currentStyle.bottom!=="auto"&&_currentStyle.height==="auto"){
+      if(_resizeHeight||(_posMatch&&!_autoBottom)){
         _this.resizeBottom(_element);
-        // TODO: needs line height calculation here too for elements smaller than the line height or font size
+        if(parseInt(_element.height)>parseInt(_element.fontSize,10)){
+          // TODO: needs line height calculation here too for elements smaller than the line height or font size
+          _element.fontSize = _element.height;
+          _element.lineHeight = _element.height;
+        }
       }
     
     // check if opacity needs to be fixed:
       if(_element.currentStyle.opacity){_this.fixOpacity(_element);}
       
     } catch(e) {
-      alert("iefix error! element:"+_element.tagName+" e:"+e.description);
+      console.log("iefix error! element:",_element);
     }
     
     // check if background image needs to be fixed:
@@ -228,7 +243,7 @@ iefix = {
   _traverseTree: function(_element){
     var _this=iefix;
     _this._traverseCount++;
-    //window.status = 'traversecount: '+_this._traverseCount;
+    // console.log( 'traversecount: '+_this._traverseCount );
     _element=_element||document.documentElement;
     while(_element){
       if(_element.nodeType===1){
@@ -259,10 +274,10 @@ iefix = {
     //this.pngCheck = new RegExp("((\.gif)|(\.jpg))$", "i"); // needs more work
     // needed for png hack
     _this.blankGifPath=ie_htc_path+"0.gif";
-    eval("_this.getMarginWidth="+String(_this.getPaddingWidth).replace(/padding/g,"margin"));
-    eval("_this.getPaddingHeight="+String(_this.getPaddingWidth).replace(/Width/g,"Height").replace(/Left/g,"Top").replace(/Right/g,"Bottom"));
-    eval("_this.getMarginHeight="+String(_this.getPaddingHeight).replace(/padding/g,"margin"));
-    eval("_this.getBorderHeight="+String(_this.getBorderWidth).replace(/Width/g,"Height"));
+    // eval("_this.getMarginWidth="+String(_this.getPaddingWidth).replace(/padding/g,"margin"));
+    // eval("_this.getPaddingHeight="+String(_this.getPaddingWidth).replace(/Width/g,"Height").replace(/Left/g,"Top").replace(/Right/g,"Bottom"));
+    // eval("_this.getMarginHeight="+String(_this.getPaddingHeight).replace(/padding/g,"margin"));
+    // eval("_this.getBorderHeight="+String(_this.getBorderWidth).replace(/Width/g,"Height"));
     eval("_this.layoutHeight="+String(_this.layoutWidth).replace(/Width/g,"Height").replace(/width/g,"height").replace(/Right/g,"Bottom"));
     eval("_this.getPixelHeight="+String(_this.getPixelWidth).replace(/Width/g,"Height"));
     eval("_this.resizeBottom="+String(_this.resizeRight).replace(/Width/g,"Height").replace(/width/g,"height").replace(/left/g,"top").replace(/right/g,"bottom"));
@@ -277,7 +292,7 @@ iefix = {
     }
   },
   
-  _traverseStyleProperties: ['width','height','left','top','right','bottom','display','position'],
+  _traverseStyleProperties: ['width','height','left','top','right','bottom','display','position','visibility'],
   //_traverseStyleProperties: ['right','bottom','width','height'],
   
   //_elemEntryCount: 0,
@@ -338,7 +353,7 @@ ie_fixes=function(){
   }
 };
 ie_fixes();
-window.onresize=function(){iefix.setWinSize();iefix._traverseTree();};
+// window.onresize=function(){iefix.setWinSize();iefix._traverseTree();};
 
 
 

data/js/debugg/debugg.js

@@ -0,0 +1,43 @@
+LOAD(function(){
+  debugg = HApplication.extend({
+    constructor: function(){
+      this.base(20,'Debugg');
+      this.view = HScrollView.extend({
+        onIdle: function(){
+          this.base();
+          this.bringToFront();
+        }
+      }).nu(
+        [0,720,null,400,0,null],
+        this
+        // , {
+        //   // styles: [
+        //   //   ['background-color','#ccc']
+        //   // ]
+        // }
+      );
+      this.debugHtml = '';
+    },
+    log: function(){
+      if(arguments.length === 1){
+        this.debugHtml += '<br>'+this.view.escapeHTML(arguments[0]);
+      }
+      else {
+        this.debugHtml += '<br>'+this.view.escapeHTML(COMM.Values.encode(arguments));
+      }
+      this.view.setHTML(this.debugHtml);
+    },
+    obj_log: function(_obj){
+      var _html = '{<br>';
+      for(var o in _obj){
+        _html += o+': '+_obj[o]+'<br>';
+      }
+      _html += '}';
+      this.log(_html);
+    }
+  }).nu();
+  if(window['console'] === undefined){
+    console = debugg;
+  }
+  debugg.log('Debugg start.');
+});

data/js/foundation/application/application.js

@@ -35,6 +35,8 @@ HApplication = HClass.extend({
   
   componentBehaviour: ['app'],
   
+  elemId: 0,
+  
 /** = Description
   *
   * = Parameters
@@ -204,4 +206,4 @@ HApplication = HClass.extend({
     /* Your code here */
   }
 });
-
+HApplication.implement(HValueResponder.nu());

data/js/foundation/control/dyncontrol/dyncontrol.js

@@ -488,6 +488,7 @@ HDynControl = HControl.extend({
     }
     this.setStyle('cursor','default');
     this._initActionFlag();
+    EVENT.resize(); // Triggers the window resize event (automatic event for the browser's window).
     return true; // prevents text selection
   }
 });

data/js/foundation/control/eventresponder/eventresponder.js

@@ -207,7 +207,7 @@ HEventResponder = HClass.extend({
       EVENT.reg(_this, _this.events);
     }
     else {
-      EVENT.unreg(this);
+      EVENT.unreg(_this);
     }
     
     // Toggle the CSS class: enabled/disabled

data/js/foundation/json_renderer/json_renderer.js

@@ -48,7 +48,6 @@ COMM.JSONRenderer = HClass.extend({
     this.view = this.renderNode( this.data, this.parent );
   },
   defineInScope: function( _definition ){
-    console.log('definedInScope(',_definition,')');
     var _isArr = (_definition instanceof Array),
         _isObj = (_definition instanceof Object);
     if( _isArr || !_isObj ){
@@ -132,7 +131,7 @@ COMM.JSONRenderer = HClass.extend({
         // Currently only HView -derived classes are supported, so 
         // the rect is mandatory.
         _rect = _dataNode['rect'],
-        _hasRect = (_rect !== undefined) && (_rect instanceof Array),
+        _hasRect = (_rect !== undefined) && (_rect instanceof Array || typeof _rect === 'string'),
         
         // Checks, if any sub-views are defined.
         _hasSubviews = _dataNode['subviews'] !== undefined,
@@ -157,7 +156,6 @@ COMM.JSONRenderer = HClass.extend({
         
         _subView;
     // console.log('className:',_className,' class:',_class);
-    
     this.scopeDepth ++;
     this.scopes.push({});
     try{

data/js/foundation/system/system.js

@@ -16,7 +16,7 @@
   ** so there is no real need to access +HSystem+ directly from user-level code.
   **
 ***/
-HSystem = HClass.extend({
+HSystem = {
   
 /** When the focus behaviour is 1, clicking on any subview brings
   * the window to front, if attached to a HWindow instance.
@@ -27,7 +27,7 @@ HSystem = HClass.extend({
   windowFocusBehaviour: 1,
   
 /** Singleton class; has no constructor **/
-  constructor: null,
+  // constructor: null,
   
 /** An array of HApplication instances, index is the appId **/
   apps: [],
@@ -357,9 +357,9 @@ HSystem = HClass.extend({
       }
     }
   }
-
+};
   
-});
+// });
 
 // Starts the ticking, when the document is loaded:
 LOAD(

data/js/foundation/thememanager/thememanager.js

@@ -132,7 +132,7 @@ HThemeManager = HClass.extend({
   **/
   getCssFilePath: function( _fileName ){
     var _themeName      = this._cssEvalParams[0];
-    if((HThemeHasIE6GifsInsteadOfPng.indexOf(_themeName)!==-1) && ELEM._is_ie6){
+    if((HThemeHasIE6GifsInsteadOfPng.indexOf(_themeName)!==-1) && (BROWSER_TYPE.ie6 || BROWSER_TYPE.symbian) ){
       return "url('"+this._joinPath( this.getThemeGfxPath(), _fileName.replace('.png','-ie6.gif') )+"')";
     }
     else {
@@ -171,7 +171,7 @@ HThemeManager = HClass.extend({
     
     var _style, _styleSheet, _head;
     
-    if(ELEM._is_ie) {
+    if(BROWSER_TYPE.ie) {
       // Internet Explorer (at least 6.x; check what 7.x does)
       _style         = document.createStyleSheet();
       _style.cssText = _cssText;
@@ -331,7 +331,7 @@ HThemeManager = HClass.extend({
     return _url;
   },
   _componentGfxFile: function( _themeName, _componentName, _themePath, _fileName ){
-    if((HThemeHasIE6GifsInsteadOfPng.indexOf(_themeName)!==-1) && ELEM._is_ie6){
+    if((HThemeHasIE6GifsInsteadOfPng.indexOf(_themeName)!==-1) && BROWSER_TYPE.ie6){
       return this._joinPath( this._componentGfxPath(_themeName, _componentName, _themePath), _fileName.replace('.png','-ie6.gif') );
     }
     return this._joinPath( this._componentGfxPath(_themeName, _componentName, _themePath), _fileName );

data/js/foundation/view/view.js

@@ -57,6 +57,10 @@ HView = HClass.extend({
   **/
   refreshOnLabelChange: true,
   
+/** Escapes HTML in the label when true.
+  **/
+  escapeLabelHTML: false,
+  
 /** True, if the coordinates are right-aligned.
   * False, if the coordinates are left-aligned.
   * Uses flexRightOffset if true. Defined with 6-item arrays
@@ -692,6 +696,7 @@ HView = HClass.extend({
     var _isDrawn = this.drawn;
     this.drawRect();
     if(!_isDrawn){
+      this.firstDraw();
       if(this['componentName']!==undefined){
         this.drawMarkup();
       }
@@ -707,6 +712,9 @@ HView = HClass.extend({
           this.setStyle(_styleKey,_styleValue);
         }
       }
+      if(this.options.html){
+        this.setHTML(this.options.html);
+      }
       if(!this.isHidden){
         this.show();
       }
@@ -715,6 +723,14 @@ HView = HClass.extend({
     return this;
   },
   
+/** = Description
+  * Called once, before the layout of the view is initially drawn.
+  * Doesn't do anything by itself, but provides an extension point.
+  *
+  **/
+  firstDraw: function(){
+  },
+  
 /** = Description
   * Called once, when the layout of the view is initially drawn.
   * Doesn't do anything by itself, but provides an extension point for making
@@ -791,6 +807,34 @@ HView = HClass.extend({
     return this;
   },
   
+/** = Description
+  * Wrapper for setHTML, sets escaped html, if tags and such are present.
+  *
+  * = Parameters
+  * +_text+:: The text to set. If it contains any html, it's escaped.
+  *
+  * = Returns
+  * +self+
+  **/
+  setText: function( _text ) {
+    return this.setHTML( this.escapeHTML( _text ) );
+  },
+  
+/** = Description
+  * Method to escape HTML from text.
+  *
+  * Converts < to &lt; and > to &gt; and & to &amp;
+  *
+  * = Parameters
+  * +_html+:: The html to escape.
+  *
+  * = Returns
+  * A string with the html escaped.
+  **/
+  escapeHTML: function( _html ) {
+    return _html.replace(/&/gmi, '&amp;').replace(/>/gmi, '&gt;').replace(/</gmi, '&lt;');
+  },
+  
 /** = Description
   *
   * This method should be extended in order to redraw only specific parts. The
@@ -815,7 +859,27 @@ HView = HClass.extend({
     }
     return this;
   },
-
+  
+/** Gets the size of the parent. If the parent is the document body, uses the browser window size.
+  **/
+  parentSize: function(){
+    if(this.parent.elemId === 0){
+      var _winSize = ELEM.windowSize();
+      return [ _winSize[0], _winSize[1] ];
+    }
+    else{
+      var _rect = this.parent.rect;
+      return [ _rect.width, _rect.height ];
+    }
+  },
+  
+/** Returns the maximum rect using the #parentSize.
+  **/
+  maxRect: function(){
+    var _parentSize = this.parentSize();
+    return [ 0, 0, _parentSize[0], _parentSize[1] ];
+  },
+  
 /** = Description
   * Replaces the rect of the component with a new HRect instance and
   * then refreshes the display.
@@ -832,6 +896,9 @@ HView = HClass.extend({
     if (this.rect) {
       this.rect.release(this);
     }
+    if(typeof _rect === 'string'){
+      _rect = this[_rect]();
+    }
     if(_rect instanceof Array){
       var _arrLen = _rect.length,
           _throwPrefix = 'HView.setRect: If the HRect instance is replaced by an array, ';
@@ -1605,6 +1672,9 @@ HView = HClass.extend({
   *
   **/
   setLabel: function(_label) {
+    if(this.escapeLabelHTML){
+      _label = this.escapeHTML( _label );
+    }
     var _this = this,
         _differs = (_label !== _this.label);
     if(_differs){