rsence-pre 2.3.0.19 → 2.3.0.20

data/VERSION

@@ -1 +1 @@
-2.3.0.19.pre
+2.3.0.20.pre

data/conf/default_conf.yaml

@@ -258,5 +258,3 @@
   #
   # Entered by code, empty container
   :broker_urls: { }
-
-

data/js/controls/imageview/imageview.js

@@ -14,7 +14,7 @@ HImageView = HControl.extend({
   getImgSrc: function(){
     var _value = (this.value!==null)?this.value:(this.options.valueObj?this.options.valueObj.value:this.options.value);
     if (!_value){
-      _value = this.getThemeGfxPath() + "/blank.gif";
+      _value = this.getThemeGfxFile("blank.gif");
     }
     return _value;
   },

data/js/controls/tab/tab.js

@@ -62,9 +62,9 @@ HTab = HControl.extend({
   // overridden in the template
   fontStyle: 'font-family:Arial,sans-serif;font-size:13px;',
   
-  tabLabelHTMLPrefix1: '<div class="edge-left"></div><div class="tablabel" style="width:',
+  tabLabelHTMLPrefix1: '<div class="edge_left"></div><div class="tablabel" style="width:',
   tabLabelHTMLPrefix2: 'px">',
-  tabLabelHTMLSuffix: '</div><div class="edge-right"></div>',
+  tabLabelHTMLSuffix: '</div><div class="edge_right"></div>',
   tabLabelParentElem: 'label',
   tabLabelElementTagName: 'div',
   tabLabelAlign: 'left',
@@ -113,15 +113,15 @@ HTab = HControl.extend({
     if(~this.selectIdx){
       var _tabSelectElemId = this.tabLabels[this.selectIdx],
           _tabSelectViewId = this.tabs[this.selectIdx];
-      ELEM.delClassName(_tabSelectElemId,'item-fg');
-      ELEM.addClassName(_tabSelectElemId,'item-bg');
+      ELEM.delClassName(_tabSelectElemId,'item_fg');
+      ELEM.addClassName(_tabSelectElemId,'item_bg');
       HSystem.views[_tabSelectViewId].hide();
     }
     if(~_tabIdx){
       var _tabLabelElemId = this.tabLabels[_tabIdx],
           _tabViewId = this.tabs[_tabIdx];
-      ELEM.delClassName(_tabLabelElemId,'item-bg');
-      ELEM.addClassName(_tabLabelElemId,'item-fg');
+      ELEM.delClassName(_tabLabelElemId,'item_bg');
+      ELEM.addClassName(_tabLabelElemId,'item_fg');
       HSystem.views[_tabViewId].show();
     }
     this.selectIdx = _tabIdx;
@@ -158,7 +158,7 @@ HTab = HControl.extend({
       _tabLabelHTML = this.tabLabelHTMLPrefix1+_labelTextWidth+this.tabLabelHTMLPrefix2+_tabLabel+this.tabLabelHTMLSuffix;
     }
     _tab.hide();
-    ELEM.addClassName(_tabLabelElemId,'item-bg');
+    ELEM.addClassName(_tabLabelElemId,'item_bg');
     ELEM.setStyle(_tabLabelElemId,'width',_labelWidth+'px');
     ELEM.setStyle(_tabLabelElemId,this.tabLabelAlign,this.rightmostPx+'px');
     ELEM.setHTML(_tabLabelElemId,_tabLabelHTML);

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

@@ -6,15 +6,15 @@
 }
 
 /* set left and width manually */
-.tab_label .item-fg,
-.tab_label .item-bg {
+.tab_label .item_fg,
+.tab_label .item_bg {
   position: absolute;
   top: 0px; height: 24px;
   background-repeat: repeat-x;
 }
 .tab_label,
-.tab_label .edge-left,
-.tab_label .edge-right,
+.tab_label .edge_left,
+.tab_label .edge_right,
 .tab_label .tablabel,
 .tab_label_fill_bg {
   background-repeat: no-repeat;
@@ -27,21 +27,21 @@
   background-repeat: repeat-x;
 }
 
-.tab_label .edge-left {
+.tab_label .edge_left {
   position: absolute;
   top: 0px; left: 0px; width: 12px; height: 24px;
   background-position: 0px 0px;
 }
-.tab_label .item-bg .edge-left {
+.tab_label .item_bg .edge_left {
   background-position: -24px 0px;
 }
 
-.tab_label .edge-right {
+.tab_label .edge_right {
   position: absolute;
   top: 0px; right: 0px; width: 9px; height: 24px;
   background-position: -12px 0px;
 }
-.tab_label .item-bg .edge-right {
+.tab_label .item_bg .edge_right {
   background-position: -36px 0px;
 }
 
@@ -60,7 +60,7 @@
   font-size: 12px; font-weight: bold;
   color: #333;
 }
-.tab_label .item-bg .tablabel {
+.tab_label .item_bg .tablabel {
   background-position: 0px -48px;
   color: #666;
 }

data/js/core/class/class.js

@@ -309,7 +309,7 @@ HClass.implement = function(_interface) {
 //var Base = HClass;
 
 // Array fix
-if ([]['indexOf']===undefined) {
+if (![].indexOf) {
   // Object.extend = function(_destination, _source) {
   //   for (var _property in _source) {
   //     _destination[_property] = _source[_property];
@@ -337,14 +337,34 @@ if(typeof String.prototype.trim !== 'function') {
 
 // ff version 3.0.3 fails on this, when firebug installed: try/catch block
 try {
+  // console.log surrogate for browsers without a console
+  if(!window.console){
+    window.console = {
+      log: function(){},
+      warn: function(){}
+    };
+  }
+} catch(e) {}
 
-// console.log surrogate for browsers without a console
-if(window['console']===undefined){
-  window.console = {
-    log: function(){},
-    warn: function(){}
+// Mozilla reference bind workaround (bind was introduced in JS 1.8.5)
+if (!Function.prototype.bind) {
+  Function.prototype.bind = function (oThis) {
+    if (typeof this !== "function") {
+      // closest thing possible to the ECMAScript 5 internal IsCallable function
+      throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");
+    }
+    var aArgs = Array.prototype.slice.call(arguments, 1), 
+        fToBind = this, 
+        fNOP = function () {},
+        fBound = function () {
+          return fToBind.apply(
+            this instanceof fNOP && oThis ? this : oThis,
+            aArgs.concat(Array.prototype.slice.call(arguments))
+          );
+        };
+
+    fNOP.prototype = this.prototype;
+    fBound.prototype = new fNOP();
+    return fBound;
   };
 }
-
-
-} catch(e) {}

data/js/core/rsence_ns/rsence_ns.coffee

@@ -26,8 +26,7 @@ RSence =
   # Call this method from the index page for
   # client-only features
   clientConf: (_clientPrefix)->
-    HThemeManager.themePath = _clientPrefix+'/themes'
-    HThemeManager._start()
+    HThemeManager.setThemePath( _clientPrefix+'/themes' )
     @loadUnselectable()
 
   # Call this method from the index page to

data/js/foundation/thememanager/thememanager.coffee

@@ -0,0 +1,203 @@
+HThemeManager = HClass.extend
+  
+  allInOneCSS: true # temporary solution until new theme is crafted
+
+  currentTheme: 'default'
+
+  constructor: null
+  
+  # Properties by theme name
+  currentThemePath: null
+  themePaths: {}
+  themes: []
+  
+  # Set the graphics loading path of the the themeName
+  setThemePath: (_clientPrefix)->
+    @currentThemePath = _clientPrefix
+    for _themeName in @themes
+      @setupThemePath( _themeName )
+
+  setupAllInOneCSS: (_themeName)->
+    _cssText = ''
+    for _componentName of @themeCSSTemplates[_themeName]
+      _cssText += @buildCSSTemplate(@, _themeName, _componentName)
+    _style = @useCSS( _cssText )
+    _cssTitle = 'rsence/'+_themeName
+    _style.title = _cssTitle
+
+  setupThemePath: (_themeName)->
+    return unless @currentThemePath?
+    return if @themePaths[_themeName]?
+    _clientThemePath = [ @currentThemePath, _themeName ].join('/') + '/gfx/'
+    @themePaths[_themeName] = _clientThemePath
+    @setupAllInOneCSS(_themeName) if @allInOneCSS
+  
+  # CSS Templates and CSS Template methods per theme name
+  themeCSSTemplates: {}
+
+  # Sets the css template data per theme, all at once
+  setThemeCSSTemplates: (_themeName, _themeCSS)->
+    @themeCSSTemplates[_themeName] = _themeCSS 
+
+  # HTML Templates and HTML Template methods per theme name
+  themeHTMLTemplates: {}
+
+  # Sets the css template data per theme, all at once
+  setThemeHTMLTemplates: (_themeName, _themeHTML)->
+    @themeHTMLTemplates[_themeName] = _themeHTML 
+
+  # Set the theme data, this is called by the serverside client_pkg suite
+  installThemeData: (_themeName, _themeCSS, _themeHTML)->
+    @themes << _themeName unless ~@themes.indexOf(_themeName)
+    @setThemeCSSTemplates(_themeName, _themeCSS)
+    @setThemeHTMLTemplates(_themeName, _themeHTML)
+    @setupThemePath(_themeName)
+
+  # Simple reference counting by theme name and component name, when 0, clear the style sheet
+  cssCountUsedBy: {}
+  cssByThemeAndComponentName: {}
+  incrementCSSUseCount: (_themeName, _componentName)->
+    @cssCountUsedBy[_themeName] = {} unless @cssCountUsedBy[_themeName]?
+    _themeCollection = @cssCountUsedBy[_themeName]
+    if _themeCollection[_componentName]?
+      _themeCollection[_componentName] += 1
+    else
+      _themeCollection[_componentName] = 1
+
+  decrementCSSUseCount: (_themeName, _componentName)->
+    unless @cssCountUsedBy[_themeName]?
+      console.log("Warning in decrementCSSUseCount; the theme #{_themeName} wasn't initialized (called with componentName: #{_componentName})")
+      return
+    _themeCollection = @cssCountUsedby[_themeName]
+    unless _themeCollection[_componentName]?
+      console.log("Warning in decrementCSSUseCount; the componentName #{_componentName} wasn't initialized (called with themeName: #{_themeName})")
+      return
+    if _themeCollection[_componentName] == 1
+      _style = @cssByThemeAndComponentName[_themeName][_componentName]
+      _style.parentNode.removeChild( _style )
+      delete _themeCollection[_componentName]
+    else
+      _themeCollection[_componentName] -= 1
+
+  _buildThemePath: (_fileName,_themeName)->
+    _fileName = _fileName.substring(1) while _fileName[0] == '/'
+    @themePaths[_themeName]+_fileName
+  _variableMatch: /#\{([a-z0-9]+?)\}/
+  _assignmentMatch: /\$\{([a-z0-9]+?)\}/
+  buildHTMLTemplate: ( _view, _themeName, _componentName )->
+    unless @themeHTMLTemplates[_themeName]?
+      console.log('Theme not installed:',_themeName)
+      return ''
+    return '' unless @themeHTMLTemplates[_themeName][_componentName]?
+    [_tmplJS, _tmplHTML] = @themeHTMLTemplates[_themeName][_componentName]
+    # console.log( 'tmplJS:', _tmplJS )
+    # console.log( 'tmplHTML:', _tmplHTML )
+    _rect   = _view.rect
+    _callArgs = [_view.elemId.toString(), _rect.width, _rect.height]
+    _tmplHTML = _tmplHTML.replace(/\]I\[/g,_callArgs[0]).replace(/\]W\[/g,_callArgs[1]).replace(/\]H\[/g,_callArgs[2])
+    return _tmplHTML if _tmplJS.length == 0
+    [_variableMatch, _assignmentMatch] = [@_variableMatch, @_assignmentMatch]
+    # _ID     = _view.elemId.toString()
+    # _WIDTH  = _rect.width
+    # _HEIGHT = _rect.height
+    _callValue = (_id,_isAssign)->
+      _id = parseInt(_id,36)-10
+      try
+        _out = _tmplJS[_id].apply(_view,_callArgs)
+        return '' if _isAssign
+        return _out
+      catch e
+        console.log "HTML Template error(#{e}) in #{_themeName}/#{_componentName}: #{_tmplJS[_id]}"
+        return ''
+    while _assignmentMatch.test(_tmplHTML)
+      _tmplHTML = _tmplHTML.replace( _assignmentMatch, _callValue( RegExp.$1, true ) )
+    while _variableMatch.test(_tmplHTML)
+      _tmplHTML = _tmplHTML.replace( _variableMatch, _callValue( RegExp.$1 ) )
+    # console.log('tmplHTML:',_tmplHTML) if _componentName == 'tab'
+    return _tmplHTML
+
+  buildCSSTemplate: ( _context, _themeName, _componentName )->
+    unless @themeCSSTemplates[_themeName]?
+      console.log('Theme not installed:',_themeName)
+      return ''
+    return '' unless @themeCSSTemplates[_themeName][_componentName]?
+    [_tmplJS, _tmplCSS] = @themeCSSTemplates[_themeName][_componentName]
+    return _tmplCSS if _tmplJS.length == 0
+    [_variableMatch, _assignmentMatch] = [@_variableMatch, @_assignmentMatch]
+    # console.log( 'tmplJS:', _tmplJS )
+    # console.log( 'tmplCSS:', _tmplCSS )
+    @getThemeGfxFile = (_fileName)-> @_buildThemePath(_fileName,_themeName)
+    @getCssFilePath = (_fileName)->
+      "url(#{@_buildThemePath(_fileName,_themeName)})"
+    _callValue = (_id,_isAssign)->
+      _oid = _id
+      _id = parseInt(_id,36)-10
+      try
+        _out = _tmplJS[_id].apply(_context)
+        return '' if _isAssign
+      catch e
+        console.log "CSS Template error(#{e}) in #{_themeName}/#{_componentName}: #{_tmplJS[_id]}"
+        _out = ''
+      return _out
+    while _assignmentMatch.test(_tmplCSS)
+      _tmplCSS = _tmplCSS.replace( _assignmentMatch, _callValue( RegExp.$1, false ) )
+    while _variableMatch.test(_tmplCSS)
+      _tmplCSS = _tmplCSS.replace( _variableMatch, _callValue( RegExp.$1 ) )
+    delete @getCssFilePath
+    delete @getThemeGfxFile
+    # console.log('tmplCSS:',_tmplCSS)
+    return _tmplCSS
+
+  resourcesFor: (_view, _themeName, _noHTML)->
+    @setupThemePath(_themeName) unless @themePaths[_themeName]?
+    _themeName = @currentTheme unless _themeName?
+    return '' unless _view.componentName?
+    _componentName = _view.componentName
+    unless @allInOneCSS # temporarily disabled until theme refactored
+      @cssByThemeAndComponentName[_themeName] = {} unless @cssByThemeAndComponentName[_themeName]?
+      _themeCollection = @cssByThemeAndComponentName[_themeName]
+      unless _themeCollection[_componentName]?
+        _style = @useCSS( @buildCSSTemplate(@, _themeName, _componentName) )
+        _cssTitle = 'rsence/'+_themeName+'/'+_componentName
+        _style.title = _cssTitle
+        _themeCollection[_componentName] = _style
+      @incrementCSSUseCount(_themeName, _componentName)
+      return if _noHTML
+      for _ancestor in _view.ancestors
+        break unless _ancestor.componentName?
+        @resourcesFor( _ancestor, _themeName, true )
+    return @buildHTMLTemplate( _view, _themeName, _componentName )
+
+  freeResourcesFor: (_view, _themeName, _noRecursion)->
+    _themeName = @currentTheme unless _themeName?
+    return unless _view.componentName?
+    _componentName = _view.componentName
+    @decrementCSSUseCount( _themeName, _componentName )
+    return if _noRectursion
+    for _ancestor in _view.ancestors
+      break unless _ancestor.componentName?
+      @freeResourcesFor( _ancestor, _themeName )
+
+  # Creates a new cascading style sheet element and set its content with css. Returns the element.
+  useCSS: (_cssText)->
+    if BROWSER_TYPE.ie
+      # Internet Explorer (at least 6.x; check what 7.x does)
+      _style         = document.createStyleSheet()
+      _style.cssText = _cssText
+    else
+      # Common, standard <style> tag generation in <head>
+      _style        = document.createElement('style')
+      _style.type   = 'text/css'
+      _style.media  = 'all'
+      
+      _head = document.getElementsByTagName('head')[0]
+      _head.appendChild(_style)
+      
+      if BROWSER_TYPE.safari
+        # This is how to do it in KHTML browsers
+        _style.appendChild( document.createTextNode(_cssText) )
+      else
+        # This works for others (add more checks, if problems with new browsers)
+        _style.textContent = _cssText
+
+      _style

data/js/foundation/view/markupview/markupview.js

@@ -19,59 +19,47 @@ HMarkupView = HClass.extend({
   * Places the resulting markup in the instance variable.
   * 
   **/
-  bindMarkupVariables: function() {
+  // bindMarkupVariables: function() {
+  //   var
+  //   _this   = this,
+  //   _ID     = _this.elemId.toString(),
+  //   _rect   = _this.rect,
+  //   _WIDTH  = _rect.width,
+  //   _HEIGHT = _rect.height,
+  //   _markup = _this.markup,
+  //   _fns    = _this.markupFns,
+  //   _callValue = function(_id,_isAssign){
+  //     console.log('callValue',_id);
+  //     var _preId = _id;
+  //     _id = parseInt(_id,36)-10;
+  //     console.log('id:',_id,'->',_preId);
+  //     try{
+  //       var
+  //       _out = _fns[_id].call(_this);
+  //       if(_isAssign){
+  //         return '';
+  //       }
+  //       else {
+  //         return _out;
+  //       }
+  //     }
+  //     catch(e){
+  //       console.log('Markup Error: ',e);
+  //       return '';
+  //     }
+  //   };
     
-    var _markup = this.markup;
+  //   while ( HMarkupView._assignment_match.test(_markup) ) {
+  //     _markup = _markup.replace( HMarkupView._assignment_match, _callValue(RegExp.$1, false) );
+  //   }
+  //   while ( HMarkupView._variable_match.test(_markup) ) {
+  //     _markup = _markup.replace( HMarkupView._variable_match, _callValue(RegExp.$1) );
+  //   }
     
-    while ( HMarkupView._assignment_match.test(_markup) ) {
-      _markup = _markup.replace( HMarkupView._assignment_match, this.evalMarkupVariable(RegExp.$1,true) );
-    }
-    while ( HMarkupView._variable_match.test(_markup) ) {
-      _markup = _markup.replace( HMarkupView._variable_match, this.evalMarkupVariable(RegExp.$1) );
-    }
-    
-    this.markup = _markup;
+  //   this.markup = _markup;
     
-    return this;
-  },
-/** = Description
-  * Evaluates a string and throws an error into console.log
-  * if the string doesn't pass evaluation.
-  * If _isAssignment flag is set to true returns empty string.
-  * if _isAssignment is set to false will return string if it passes
-  * evaluation.
-  *
-  * = Parameters
-  * +_strToEval+::      A String to evaluate.
-  * 
-  * +_isAssignment+::   Flag to indicate return the String upon passed
-  *                     evaluation(false) or return of an empty String(true).
-  *
-  * = Returns
-  * +String+
-  * 
-  **/
-  evalMarkupVariable: function(_strToEval,_isAssignment){
-    try {
-      var _ID     = this.elemId.toString(),
-          _WIDTH  = this.rect.width,
-          _HEIGHT = this.rect.height,
-          _result = eval(_strToEval);
-      if(_isAssignment){
-        return '';
-      }
-      if(_result===undefined){
-        return '';
-      }
-      else {
-        return _result;
-      }
-    }
-    catch(e) {
-      console.log("Warning, the markup string '"+_strToEval+"' failed evaluation. Reason:"+e+' '+e.description);
-      return '';
-    }
-  },
+  //   return this;
+  // },
   
 /** = Description
   * Sets or unsets the _cssClass into a DOM element that goes by the ID
@@ -100,8 +88,8 @@ HMarkupView = HClass.extend({
     return this;
   }
   
-},{
-  _variable_match: new RegExp(/#\{([^\}]*)\}/),
-  _assignment_match: new RegExp(/\$\{([^\}]*)\}/)
+// },{
+//   _variable_match: new RegExp(/#\{([^\}]*)\}/),
+//   _assignment_match: new RegExp(/\$\{([^\}]*)\}/)
 });