rsence-pre 2.3.0.19 → 2.3.0.20

data/js/foundation/view/view.js

@@ -504,7 +504,8 @@ HView = UtilMethods.extend({
     } else {
       _themeName = HThemeManager.currentTheme;
     }
-    return HThemeManager._componentGfxPath( _themeName,  this.componentName, this.themePath );
+    // return HThemeManager._componentGfxPath( _themeName,  this.componentName, this.themePath );
+    return HThemeManager.themePaths[_themeName];
   },
   
 /** = Description
@@ -520,7 +521,8 @@ HView = UtilMethods.extend({
     } else {
       _themeName = HThemeManager.currentTheme;
     }
-    return HThemeManager._componentGfxFile( _themeName,  this.componentName, this.themePath, _fileName );
+    // return HThemeManager._componentGfxFile( _themeName,  this.componentName, this.themePath, _fileName );
+    return HThemeManager._buildThemePath( _fileName, _themeName );
   },
   
 /** --
@@ -716,7 +718,7 @@ HView = UtilMethods.extend({
     this.drawRect();
     if(!_isDrawn){
       this.firstDraw();
-      if(this['componentName']!==undefined){
+      if(this.componentName!==undefined){
         this.drawMarkup();
       }
       else if(BROWSER_TYPE.ie && this._ieNoThrough === null){
@@ -779,21 +781,24 @@ HView = UtilMethods.extend({
   * active theme is used.
   * ++
   **/
-  _loadMarkup: function() {
-    var _themeName, _markup;
-    if (this.preserveTheme) {
-      _themeName = this.theme;
-    }
-    else {
-      _themeName = HThemeManager.currentTheme;
-    }
-    _markup = HThemeManager.getMarkup( _themeName, this.componentName, this.themePath );
-    if(_markup === false && !this.isProduction){
-      console.log('Warning: Markup template for "'+this.componentName+'" using theme "'+_themeName+'" not loaded.');
-    }
-    this.markup = _markup;
-    return (_markup !== false);
-  },
+  // _loadMarkup: function() {
+  //   var _themeName, _themeData, _markup, _markupFns;
+  //   if (this.preserveTheme) {
+  //     _themeName = this.theme;
+  //   }
+  //   else {
+  //     _themeName = HThemeManager.currentTheme;
+  //   }
+  //   _themeData = HThemeManager.getMarkup( _themeName, this.componentName, this.themePath );
+  //   if(_themeData === false && !this.isProduction){
+  //     console.log('Warning: Markup template for "'+this.componentName+'" using theme "'+_themeName+'" not loaded.');
+  //   }
+  //   _markup = _themeData[0];
+  //   _markupFns = _themeData[1];
+  //   this.markup = _markup;
+  //   this.markupFns = _markupFns;
+  //   return (_markup !== false);
+  // },
   
 /** = Description
   * Replaces the contents of the view's DOM element with html from the theme specific html file.
@@ -806,18 +811,27 @@ HView = UtilMethods.extend({
     // ELEM.setStyle(this.elemId, 'display', 'none', true);
     
     // continue processing from here on:
-    var _markupStatus = this._loadMarkup();
-    
-    this.bindMarkupVariables();
-    ELEM.setHTML(this.elemId, this.markup);
+    // var _markupStatus = this._loadMarkup();
     
+    // this.bindMarkupVariables();
+    var _themeName, _markup;
+    if (this.preserveTheme) {
+      _themeName = this.theme;
+    }
+    else {
+      _themeName = HThemeManager.currentTheme;
+    }
+    _markup = HThemeManager.resourcesFor( this, _themeName );
     this.markupElemIds = {};
-    for(var i=0; i < this.markupElemNames.length; i++ ) {
-      var _partName = this.markupElemNames[ i ],
-          _elemName = _partName + this.elemId,
-          _htmlIdMatch = ' id="' + _elemName + '"';
-      if( ~this.markup.indexOf( _htmlIdMatch ) ) {
-        this.markupElemIds[ _partName ] = this.bindDomElement( _elemName );
+    if( _markup !== '' ){
+      ELEM.setHTML(this.elemId, _markup);
+      for(var i=0; i < this.markupElemNames.length; i++ ) {
+        var _partName = this.markupElemNames[ i ],
+            _elemName = _partName + this.elemId,
+            _htmlIdMatch = ' id="' + _elemName + '"';
+        if( ~_markup.indexOf( _htmlIdMatch ) ) {
+          this.markupElemIds[ _partName ] = this.bindDomElement( _elemName );
+        }
       }
     }
     

data/plugins/client_pkg/client_pkg.rb

@@ -1,15 +1,15 @@
 
 # the library path of this plugin
-lib_path = File.join( bundle_path, 'lib' )
+lib_path = File.expand_path( 'lib', bundle_path )
 
 # The ClientPkgCache class:
-require File.join( lib_path, 'client_pkg_cache' )
+require File.expand_path( 'client_pkg_cache', lib_path )
 
 # The ClientPkgServe module:
-require File.join( lib_path, 'client_pkg_serve' )
+require File.expand_path( 'client_pkg_serve', lib_path )
 
 # The ClientPkgBuild class:
-require File.join( lib_path, 'client_pkg_build' )
+require File.expand_path( 'client_pkg_build', lib_path )
 
 
 # @private The ClientPkgPlugin builds and serves the client packages. It's not intended to be a part of the public API at this time.

data/plugins/client_pkg/lib/client_pkg_build.rb

@@ -28,7 +28,7 @@ class ClientPkgBuild
     return gz_string
   end
   
-  def read_css( src_path )
+  def read_css( src_path, theme_name, component_name )
     css_data = read_file( src_path )
     unless @debug
       unless @no_whitespace_removal
@@ -38,27 +38,56 @@ class ClientPkgBuild
         end
       end
     end
-    if @no_gzip
-      gz_css = false
-    else
-      gz_css = gzip_string( css_data )
-    end
-    return [css_data, gz_css]
+    tmpl_to_js( css_data, theme_name, component_name )
   end
   
-  def read_html( src_path )
+  ID_RE = /(#\{_ID\})/
+  WIDTH_RE = /(#\{_WIDTH\})/
+  HEIGHT_RE = /(#\{_HEIGHT\})/
+  TMPL_RE = /([#\$])\{([^\}]*?)\}/m
+  def tmpl_to_js( tmpl, theme_name, component_name )
+    js_cmds = []
+    seq_num = 10
+    cached_idx = {}
+    tmpl.gsub!( ID_RE, ']I[')
+    tmpl.gsub!( WIDTH_RE, ']W[')
+    tmpl.gsub!( HEIGHT_RE, ']H[')
+    tmpl.gsub!( TMPL_RE ) do
+      ( js_type, js_code ) = [ $1, $2 ]
+      if cached_idx.has_key?( js_code )
+        seq_id = cached_idx[ js_code ]
+      else
+        seq_id = seq_num.to_s(36)
+        cached_idx[ js_code ] = seq_id
+        seq_num += 1
+        if js_code.include?('_HEIGHT')
+          fn_args = '_ID,_WIDTH,_HEIGHT'
+        elsif js_code.include?('_WIDTH')
+          fn_args = '_ID,_WIDTH'
+        elsif js_code.include?('_ID')
+          fn_args = '_ID'
+        else
+          fn_args = ''
+        end
+        if js_type == '$'
+          js_cmds << "function(#{fn_args}){#{js_code}}"
+        else
+          js_cmds << "function(#{fn_args}){return #{js_code}}"
+        end
+      end
+      "#{js_type}{#{seq_id}}"
+    end
+    %{[[#{js_cmds.join(',')}],#{tmpl.to_json}]}
+  end
+
+  def read_html( src_path, theme_name, component_name )
     html_data = read_file( src_path )
     unless @debug
       unless @no_whitespace_removal
         html_data = @html_min.minimize( html_data )
       end
     end
-    if @no_gzip
-      gz_html = false
-    else
-      gz_html = gzip_string( html_data )
-    end
-    return [html_data, gz_html]
+    tmpl_to_js( html_data, theme_name, component_name )
   end
   
   def read_gfx( src_path_theme, theme_newest )
@@ -92,36 +121,34 @@ class ClientPkgBuild
         theme_newest = 0
       end
       if theme_newest == 0 or find_newer( src_path_theme, theme_newest )
-        theme_css = { :data => '' }
-        theme_html = { :data => '' }
         theme_size = {
           :css => [0,0],
           :html => [0,0],
           :gfx => 0
         }
+        theme_css = ''
         [ File.join( src_path_theme, bundle_name+'.css' ),
           File.join( src_path_theme, 'css', bundle_name+'.css' )
         ].each do |src_file_css|
           if File.exist?( src_file_css )
             fstat = File.stat( src_file_css )
             theme_newest = fstat.mtime.to_f if fstat.mtime.to_f > theme_newest
-            ( css_data, gz_css ) = read_css( src_file_css )
-            theme_css = { :data => css_data, :gzip => gz_css }
+            theme_css = read_css( src_file_css, theme_name, bundle_name )
             theme_size[:css][0] += fstat.size
-            theme_size[:css][1] += css_data.bytesize
+            theme_size[:css][1] += theme_css.bytesize
             break
           end
         end
+        theme_html = ''
         [ File.join( src_path_theme, bundle_name+'.html' ),
           File.join( src_path_theme, 'html', bundle_name+'.html' )
         ].each do |src_file_html|
           if File.exist?( src_file_html )
             fstat = File.stat( src_file_html )
             theme_newest = fstat.mtime.to_f if fstat.mtime.to_f > theme_newest
-            ( html_data, gz_html ) = read_html( src_file_html )
-            theme_html = { :data => html_data, :gzip => gz_html }
+            theme_html = read_html( src_file_html, theme_name, bundle_name )
             theme_size[:html][0] += fstat.size
-            theme_size[:html][1] += html_data.bytesize
+            theme_size[:html][1] += theme_html.bytesize
             break
           end
         end
@@ -142,8 +169,8 @@ class ClientPkgBuild
         theme_html = tc[:html]
         theme_gfx = tc[:gfx]
       end
-      @html_by_theme[theme_name][bundle_name] = theme_html[:data]
-      @css_by_theme[theme_name][bundle_name] = theme_css[:data]
+      @html_by_theme[theme_name][bundle_name] = theme_html
+      @css_by_theme[theme_name][bundle_name] = theme_css
       th = @themes[theme_name]
       th[:css][bundle_name] = theme_css
       th[:html][bundle_name] = theme_html
@@ -161,9 +188,7 @@ class ClientPkgBuild
       ts[:html][0] += theme_size[:html][0]
       ts[:html][1] += theme_size[:html][1]
       ts[:gfx] += theme_size[:gfx]
-
     end
-
     @theme_time += (Time.now.to_f - time_start)
   end
   
@@ -379,43 +404,37 @@ class ClientPkgBuild
     @theme_names.each do |theme_name|
       html_templates = @html_by_theme[ theme_name ]
       css_templates  = @css_by_theme[  theme_name ]
-      theme_css_template_data = css_templates.values.join("\n")
-      theme_html_js_arr = []
-      theme_html_js_arr.push "(function(){"
-      theme_html_js_arr.push "HThemeManager._tmplCache[#{theme_name.to_json}]=#{html_templates.to_json}; "
-      theme_html_js_arr.push "HNoComponentCSS.push(#{theme_name.to_json});"
-      theme_html_js_arr.push "HNoCommonCSS.push(#{theme_name.to_json});"
-      theme_html_js_arr.push %{
-        HThemeManager._pushStart( function(){
-          var _this = HThemeManager;
-          _this._cssUrl( #{theme_name.to_json}, #{(theme_name+'_theme').to_json}, _this.themePath, null );
-          _this.useCSS(#{theme_css_template_data.to_json});
-        } );
-      }
-      theme_html_js_arr.push "})();"
-      theme_html_js = theme_html_js_arr.join("\n")
-      @package_origsizes[theme_name+'_theme'] = theme_html_js.bytesize
-      theme_html_js = process_js( theme_html_js )
-      @js[theme_name+'_theme'] = theme_html_js
-      unless @no_gzip
-        theme_html_gz = gzip_string( @js[theme_name+'_theme'] )
-        @gz[theme_name+'_theme'] = theme_html_gz
+      css_template = ''
+      css_templates.each do |bundle_name,theme_data|
+        css_template += "#{bundle_name.to_json}:#{theme_data}," unless theme_data.empty?
       end
-      unless @quiet
-        print_stat( "#{theme_name}/html", @theme_sizes[theme_name][:html][0], @theme_sizes[theme_name][:html][1], theme_html_gz.bytesize )
-      end
-      @themes[theme_name][:css][theme_name+'_theme'] = {
-        :data => theme_css_template_data,
-        :gzip => false
-      }
-      unless @no_gzip
-        theme_css_template_data_gz = gzip_string( theme_css_template_data )
-        @themes[theme_name][:css][theme_name+'_theme'][:gzip] = theme_css_template_data_gz
+      css_template.chop! if css_template.end_with?(',')
+      # theme_css_template_data = css_templates.values.join(",")
+      html_template = ''
+      html_templates.each do |bundle_name,theme_data|
+        html_template += "#{bundle_name.to_json}:#{theme_data}," unless theme_data.empty?
       end
+      html_template.chop! if html_template.end_with?(',')
+      theme_html_js = "(function(){HThemeManager.installThemeData(#{theme_name.to_json},{#{css_template}},{#{html_template}})})();"
+      pkg_name = theme_name+'_theme'
+      orig_size = theme_html_js.bytesize
+      theme_html_js = @jsmin.minimize( theme_html_js ) unless @no_whitespace_removal
+      @destination_files[pkg_name] = theme_html_js
+      @destination_origsize[pkg_name] = orig_size
+      # @package_origsizes[theme_name+'_theme'] = theme_html_js.bytesize
+      # theme_html_js = process_js( theme_html_js )
+      # @js[theme_name+'_theme'] = theme_html_js
+      # unless @no_gzip
+      #   theme_html_gz = gzip_string( @js[theme_name+'_theme'] )
+      #   @gz[theme_name+'_theme'] = theme_html_gz
+      # end
+      # unless @quiet
+      #   print_stat( "#{theme_name}/html", @theme_sizes[theme_name][:html][0], @theme_sizes[theme_name][:html][1], theme_html_gz.bytesize )
+      # end
       unless @quiet
-        print_stat( "#{theme_name}/css", @theme_sizes[theme_name][:css][0], @theme_sizes[theme_name][:css][1], theme_css_template_data_gz.bytesize )
+        # print_stat( "#{theme_name}/css", @theme_sizes[theme_name][:css][0], @theme_sizes[theme_name][:css][1], theme_css_template_data_gz.bytesize )
         print_stat( "#{theme_name}/gfx", @theme_sizes[theme_name][:gfx], @theme_sizes[theme_name][:gfx], @theme_sizes[theme_name][:gfx] )
-        @logger.log( '' )
+        # @logger.log( '' )
       end
     end
     @theme_time += (Time.now.to_f - time_start)
@@ -520,10 +539,11 @@ class ClientPkgBuild
 
     compose_destinations
 
-    build_indexes
+    build_themes
 
+    build_indexes
     minimize_data
-    build_themes
+
     build_compound_packages
     
     ms_taken = ((Time.now.to_f*10000)-time_start).round/10.0

data/plugins/client_pkg/lib/client_pkg_serve.rb

@@ -143,17 +143,15 @@ module ClientPkgServe
     has_theme = @client_cache.theme_cache.has_key?( theme_name )
     
     # checks for theme part (css/html/gfx)
-    has_theme_part = ( has_theme and @client_cache.theme_cache[theme_name].has_key?( theme_part ) )
+    if theme_part == :css or theme_part == :html
+      has_theme_part = false
+    else
+      has_theme_part = ( has_theme and @client_cache.theme_cache[theme_name].has_key?(theme_part) )
+    end
     
     # checks for theme file
     has_theme_file = ( has_theme_part and @client_cache.theme_cache[theme_name][theme_part].has_key?( req_file ) )
     
-    if not has_theme_file and req_file == 'common.css'
-      response.status = 200
-      response['Content-Type'] = 'text/css'
-      response.body = ''
-    end
-    
     if not has_theme
       response.status = 404
       response.body   = '404 - Theme Not Found'
@@ -166,50 +164,28 @@ module ClientPkgServe
       response.body   = '404 - Theme Resource Not Found'
       puts "File not found, avail: #{@client_cache.theme_cache[theme_name][theme_part].keys.join(', ')}" if RSence.args[:verbose]
     else
-      
       response.status = 200
-      
       file_ext = req_file.split('.')[-1]
       response['Content-Type'] = {
-        'html' => 'text/html; charset=utf-8',
-        'css'  => 'text/css; charset=utf-8',
         'png'  => 'image/png',
         'jpg'  => 'image/jpeg',
         'gif'  => 'image/gif',
         'swf'  => 'application/x-shockwave-flash'
       }[file_ext]
-      
-      if theme_part == :gfx
-        support_gzip = false
-      else
-        support_gzip = support_gzip?( ua )
+      # Special IE6 condition to serve gifs instead of png's, because it works much better
+      # than using the ActiveX alpha filter hack
+      if ua[:msie6] and req_file[-4..-1] == '.png'
+        ie6_req_png2gif = req_file.gsub('.png','-ie6.gif')
+        req_file = ie6_req_png2gif if @client_cache.theme_cache[theme_name][theme_part].include?(ie6_req_png2gif)
       end
-      
-      if support_gzip
-        response['Last-Modified'] = @client_cache.last_modified
-        body = @client_cache.theme_cache[theme_name][theme_part][ req_file+'.gz' ]
-        response['Content-Length'] = body.bytesize.to_s
-        response['Content-Encoding'] = 'gzip'
-        response.body   = body
-      else
-        
-        # Special IE6 condition to serve gifs instead of png's, because it works much better
-        # than using the ActiveX alpha filter hack
-        if ua[:msie6] and req_file[-4..-1] == '.png'
-          ie6_req_png2gif = req_file.gsub('.png','-ie6.gif')
-          req_file = ie6_req_png2gif if @client_cache.theme_cache[theme_name][theme_part].include?(ie6_req_png2gif)
-        end
-      
-        response['Last-Modified'] = @client_cache.last_modified
-        body = @client_cache.theme_cache[theme_name][theme_part][ req_file ]
-        if body.nil?
-          warn "ClientPkgServe#get: empty body for #{request.path}"
-          body = ''
-        end
-        response['Content-Length'] = body.bytesize.to_s
-        response.body = body
-        
+      response['Last-Modified'] = @client_cache.last_modified
+      body = @client_cache.theme_cache[theme_name][theme_part][req_file]
+      if body.nil?
+        warn "ClientPkgServe#get: empty body for #{request.path}"
+        body = ''
       end
+      response['Content-Length'] = body.bytesize.to_s
+      response.body = body
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsence-pre
 version: !ruby/object:Gem::Version
-  version: 2.3.0.19
+  version: 2.3.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsence-deps
@@ -289,7 +289,6 @@ files:
 - js/core/iefix/ie_css_style.htc
 - js/core/iefix/iefix.js
 - js/core/rsence_ns/rsence_ns.coffee
-- js/core/rsence_ns/rsence_ns.js
 - js/core/util/util_methods/util_methods.coffee
 - js/datetime/calendar/calendar.coffee
 - js/datetime/calendar/themes/default/calendar.css
@@ -338,7 +337,7 @@ files:
 - js/foundation/json_renderer/json_renderer.js
 - js/foundation/locale_settings/locale_settings.js
 - js/foundation/system/system.js
-- js/foundation/thememanager/thememanager.js
+- js/foundation/thememanager/thememanager.coffee
 - js/foundation/value/value.js
 - js/foundation/view/markupview/markupview.js
 - js/foundation/view/morphanimation/morphanimation.js