rsence-pre 3.0.0.7 → 3.0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9e67ee3d79ed1c1533a87cf9aa0b67fe7d10cb3
-  data.tar.gz: 137fd0c7ebdaa1bc67819d4e60f71e053c139fcd
+  metadata.gz: e6dd280bbf9fe1c080d0eba1085327fc25663fe6
+  data.tar.gz: fd9c7ce53a81ecd4099461708f70ea6b256033f0
 SHA512:
-  metadata.gz: 9e7a49a8227d396e2c0126fcc85af7f4f8e53e8d272f8181e6d9c1cfe09df959b8d94b46776990bc300c8495be96ccfa7ef737a3a9a458afbbbc6062ad1978ff
-  data.tar.gz: 31087cdeaf8159802eb1a63e59bd325be991e8afcc621268889cf3f5afc8a55028b3b423b0bfb01bac58d946d698efeec51c0a3954577c7f51f688c66acd12aa
+  metadata.gz: f19eaa0dacb233b00ec7b3eef43c0ae976c74112878582ef4cbbfb76b92f9d54cd166058e97431df64cdaf86f121e875d3b250100398610cc055b998a03f8f6a
+  data.tar.gz: 7a0dbe67283aeddecf7c6173276735cf828a64465e7a53c5d9765c19967a4942346748f2204c385a41ad6c281be60f48d6ce68b7345d0f3f6b9cc29883ba739c

data/VERSION

@@ -1 +1 @@
-3.0.0.7.pre
+3.0.0.8.pre

data/client/js/controls/button/button.coffee

@@ -35,6 +35,13 @@ HButton = HControl.extend
   click: ->
     console.log('no click action defined in HButton') if !@isProduction
 
+  refresh: ->
+    @base()
+    if @options.defaultKeyClick
+      @toggleCSSClass(@elemId,'action',true)
+    else
+      @toggleCSSClass(@elemId,'action',false)
+
   labelPadding: 0
   optimizeWidth: ->
     _labelWidth = @stringWidth(@label,null,@markupElemIds.label)

data/client/js/controls/button/themes/default/button.css

@@ -15,12 +15,12 @@
   top: 2px; left: 2px; right: 2px; bottom: 3px;
   border: 1px solid #e0e0e0;
   border-top: 0; border-left: 0;
-  box-shadow: 0px 0px 3px #333;
+  box-shadow: 0 0 3px #333;
   #{this.gradientCSS('#fcfcfc',[45,'#ffffff'],[55,'#fdfdfd'],[75,'#f3f3f3'],'#f0f0f0')}
 }
 .default.disabled > .button_control > .button_bg {
   border-color: #ddd;
-  box-shadow: 0px 0px 3px #666;
+  box-shadow: 0 0 3px #666;
   opacity: 0.75;
   #{this.gradientCSS('#d6d6d6',[66,'#d0d0d0'],[71,'#d3d3d3'],'#cccccc')}
 }
@@ -38,19 +38,53 @@
 .default.disabled > .button_control > .button_label {
   color: #999;
 }
+
+.default.enabled.action > .button_control > .button_bg {
+  border-color: #000;
+  box-shadow: 0 0 3px #000;
+  #{this.gradientCSS('#333',[45,'#555'],[55,'#444'],[75,'#222'],'#111')}
+}
+.default.enabled.action > .button_control > .button_label {
+  color: #fdfdfd;
+  text-shadow: 0 0 2px #000;
+}
+
 .default.enabled > .button_control:hover > .button_bg {
-  box-shadow: 0px 0px 3px #000;
+  box-shadow: 0 0 3px #000;
   #{this.gradientCSS('#f6f6f6',[66,'#ffffff'],[71,'#fcfcfc'],'#f0f0f0')}
 }
 .default.enabled > .button_control:hover > .button_label {
   color: #000;
 }
+
+.default.enabled.action > .button_control:hover > .button_bg {
+  border-color: #000;
+  box-shadow: 0 0 3px #000;
+  #{this.gradientCSS('#111',[66,'#333'],[71,'#333'],'#000')}
+}
+.default.enabled.action > .button_control:hover > .button_label {
+  color: #fff;
+  text-shadow: 0 0 2px #000;
+}
+
 .default.enabled > .button_control:active > .button_bg {
   border: 1px solid #fff;
   border-bottom: 0; border-right: 0;
-  box-shadow: 0px 0px 3px #000;
+  box-shadow: 0 0 3px #000;
   #{this.gradientCSS('#e6e6e6',[29,'#f0f0f0'],[33,'#f6f6f6'],'#ffffff')}
 }
 .default.enabled > .button_control:active > .button_label {
   color: #000;
 }
+
+.default.enabled.action > .button_control:active > .button_bg {
+  border: 1px solid #fff;
+  margin: -1px;
+  box-shadow: 0 0 3px #fff;
+  #{this.gradientCSS('#111',[29,'#333'],[33,'#333'],'#000')}
+}
+.default.enabled.action > .button_control:active > .button_label {
+  color: #fff;
+  text-shadow: 0 0 2px #000;
+}
+

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

@@ -12,7 +12,6 @@
   top: 0; height: 24px;
   background-repeat: repeat-x;
 }
-.tab_label,
 .tab_label .edge_left,
 .tab_label .edge_right,
 .tab_label .tablabel,

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

@@ -3,4 +3,11 @@
 </div>
 <div class="tab_label" id="label]I["></div>
 <div class="tab_label_fill_bg" id="state]I["></div>
-${this.tabLabelLeftEdge=12;this.tabLabelRightEdge=9;this.tabLabelHeight=24;this.fontStyle='font-family: Helvetica, Arial, sans-serif;font-size:12px;font-weight:bold;';this.tabLabelFillBg=true;}
+${#!coffee
+@themeStyle = ->
+  @tabLabelLeftEdge = ( @options.tabLabelLeftEdge or 12 )
+  @tabLabelRightEdge = ( @options.tabLabelRightEdge or 9 )
+  @tabLabelHeight = ( @options.tabLabelHeight or 24 )
+  @fontStyle = 'font-family:Helvetica,Arial,sans-serif;font-size:12px;font-weight:bold;'
+  @tabLabelFillBg = true
+}

data/client/js/foundation/thememanager/thememanager.coffee

@@ -22,8 +22,9 @@ HThemeManager = HClass.extend
     for _componentName of @themeCSSTemplates[_themeName]
       _cssText += @buildCSSTemplate(@, _themeName, _componentName)
     _style = @useCSS( _cssText )
-    _cssTitle = 'rsence/'+_themeName
-    _style.title = _cssTitle
+    # Causes issues in Firefox:
+    # _cssTitle = 'rsence/'+_themeName
+    # _style.title = _cssTitle
 
   setupThemePath: (_themeName)->
     return unless @currentThemePath?
@@ -48,7 +49,7 @@ HThemeManager = HClass.extend
 
   # Set the theme data, this is called by the serverside client_pkg suite
   installThemeData: (_themeName, _themeCSS, _themeHTML)->
-    @themes << _themeName unless ~@themes.indexOf(_themeName)
+    @themes.push(_themeName) unless ~@themes.indexOf(_themeName)
     @setThemeCSSTemplates(_themeName, _themeCSS)
     @setThemeHTMLTemplates(_themeName, _themeHTML)
     @setupThemePath(_themeName)
@@ -204,13 +205,13 @@ HThemeManager = HClass.extend
       _style.media  = 'all'
 
       _head = document.getElementsByTagName('head')[0]
+      _head.appendChild(_style)
 
-      if BROWSER_TYPE.safari
+      if BROWSER_TYPE.safari or BROWSER_TYPE.firefox or BROWSER_TYPE.opera
         # 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)
+        # This works for many others (add more checks, if problems with new browsers)
         _style.textContent = _cssText
-      _head.appendChild(_style)
 
       _style

data/plugins/client_pkg/client_pkg.rb

@@ -3,20 +3,31 @@
 lib_path = File.expand_path( 'lib', bundle_path )
 
 # The ClientPkgCache class:
-require File.expand_path( 'client_pkg_cache', lib_path )
+if RSence.args[:debug]
+  load File.expand_path( 'client_pkg_cache.rb', lib_path )
+else
+  require File.expand_path( 'client_pkg_cache', lib_path )
+end
 
 # The ClientPkgServe module:
-require File.expand_path( 'client_pkg_serve', lib_path )
+if RSence.args[:debug]
+  load File.expand_path( 'client_pkg_serve.rb', lib_path )
+else
+  require File.expand_path( 'client_pkg_serve', lib_path )
+end
 
 # The ClientPkgBuild class:
-require File.expand_path( 'client_pkg_build', lib_path )
-
+if RSence.args[:debug]
+  load File.expand_path( 'client_pkg_build.rb', lib_path )
+else
+  require File.expand_path( 'client_pkg_build', lib_path )
+end
 
 # @private The ClientPkgPlugin builds and serves the client packages. It's not intended to be a part of the public API at this time.
 class ClientPkgPlugin < Servlet
-  
+
   include ClientPkgServe
-  
+
   class BuildLogger
     def initialize( log_path )
       @last_time = Time.now
@@ -45,7 +56,7 @@ class ClientPkgPlugin < Servlet
       @log_file = nil
     end
   end
-  
+
   def rebuild_client
     @build_busy = true
     next_change=Time.now.to_f
@@ -58,7 +69,7 @@ class ClientPkgPlugin < Servlet
     @last_change = next_change
     @build_busy = false
   end
-  
+
   def ready?
     return (not @build_busy)
   end
@@ -86,43 +97,43 @@ class ClientPkgPlugin < Servlet
         end
       end
     end
-    
+
   end
-  
+
   def add_src_dir( src_dir ); @client_build.add_src_dir( src_dir ); end
   def add_src_dirs( src_dirs ); @client_build.add_src_dirs( src_dirs ); end
   def del_src_dir( src_dir ); @client_build.del_src_dir( src_dir ); end
   def del_src_dirs( src_dirs ); @client_build.del_src_dirs( src_dirs ); end
-  
+
   def add_theme( theme_name ); @client_build.add_theme( theme_name ); end
   def add_themes( theme_names ); @client_build.add_themes( theme_names ); end
   def del_theme( theme_name ); @client_build.del_theme( theme_name ); end
   def del_themes( theme_names ); @client_build.del_themes( theme_names ); end
-  
+
   def add_package( pkg_name, pkg_items ); @client_build.add_package( pkg_name, pkg_items ); end
   def add_packages( packages ); @client_build.add_packages( packages ); end
   def del_package( pkg_name ); @client_build.del_package( pkg_name ); end
   def del_packages( packages ); @client_build.del_packages( packages ); end
-  
+
   def add_compound( compound_name, pkg_names ); @client_build.add_compound( compound_name, pkg_names ); end
   def add_compounds( compounds ); @client_build.add_compounds( compounds ); end
   def del_compound( compound_name ); @client_build.del_compound( compound_name ); end
   def del_compounds( compounds ); @client_build.del_compounds( compounds ); end
-  
+
   def add_reserved_name( reserved_name ); @client_build.add_reserved_name( reserved_name ); end
   def add_reserved_names( reserved_names ); @client_build.add_reserved_names( reserved_names ); end
   def del_reserved_name( reserved_name ); @client_build.del_reserved_name( reserved_name ); end
   def del_reserved_names( reserved_names ); @client_build.del_reserved_names( reserved_names ); end
-  
+
   def add_gfx_format( gfx_format_name ); @client_build.add_gfx_format( gfx_format_name ); end
   def add_gfx_formats( gfx_format_names ); @client_build.add_gfx_formats( gfx_format_names ); end
   def del_gfx_format( gfx_format_name ); @client_build.del_gfx_format( gfx_format_name ); end
   def del_gfx_formats( gfx_format_names ); @client_build.del_gfx_formats( gfx_format_names ); end
-  
+
   def client_build; @client_build; end
-  
+
   def client_cache; @client_cache; end
-  
+
   def close
     if @thr
       @thr.kill
@@ -133,7 +144,7 @@ class ClientPkgPlugin < Servlet
     @client_cache = nil
     @build_logger.close
   end
-  
+
   def squeeze( js )
     return @client_build.squeeze( js )
   end
@@ -141,22 +152,22 @@ class ClientPkgPlugin < Servlet
   def coffee( src )
     return @client_build.coffee( src )
   end
-  
+
   def init
-    
+
     @thr = false
-    
+
     @build_logger = BuildLogger.new( File.join(RSence.args[:env_path],'log','build_log') )
     @build_logger.open
-    
+
     @client_build = ClientPkgBuild.new( RSence.config[:client_pkg], @build_logger )
     @client_cache = ClientPkgCache.new
-    
+
     @build_busy = false
     rebuild_client
-    
+
   end
-  
+
 end
 
 

data/plugins/client_pkg/lib/client_pkg_build.rb

@@ -2,9 +2,44 @@
 require 'jsmin_c'
 require 'jscompress'
 require 'html_min'
+begin
+  require 'sass'
+  RSence.config[:client_pkg][:sass_supported] = true
+  module Sass::Script::Functions
+    def js_call(string)
+      tmpl_js = '${'+string.value+'}'
+      Sass::Script::String.new(tmpl_js)
+    end
+    def js_tmpl(string)
+      # assert_type string, :String
+      tmpl_js = '#{'+string.value+'}'
+      # puts "js_tmpl(#{string.inspect}) -> #{tmpl_js.inspect}"
+      Sass::Script::String.new(tmpl_js)
+    end
+    declare :js_call, :args => [:string]
+    declare :js_tmpl, :args => [:string]
+  end
+rescue LoadError
+  warn "SASS not installed. Install the 'sass' gem to enable."
+  RSence.config[:client_pkg][:sass_supported] = false
+end
 begin
   require 'coffee-script'
   RSence.config[:client_pkg][:coffee_supported] = true
+  module Sass::Script::Functions
+    def coffee_call(string)
+      js_src = CoffeeScript.compile( string.value, :bare => true )
+      tmpl_js = '${'+js_src+'}'
+      Sass::Script::String.new(tmpl_js)
+    end
+    def coffee_tmpl(string)
+      js_src = CoffeeScript.compile( string.value, :bare => true )
+      tmpl_js = '#{'+js_src+'}'
+      Sass::Script::String.new(tmpl_js)
+    end
+    declare :coffee_call, :args => [:string]
+    declare :coffee_tmpl, :args => [:string]
+  end
 rescue LoadError
   warn "CoffeeScript not installed. Install the 'coffee-script' gem to enable."
   RSence.config[:client_pkg][:coffee_supported] = false
@@ -30,6 +65,24 @@ class ClientPkgBuild
 
   def read_css( src_path, theme_name, component_name )
     css_data = read_file( src_path )
+    if @sass_supported
+      begin
+        if src_path.end_with?('.sass')
+          css_data = Sass::Engine.new(css_data,:syntax => :sass, :style => :compressed).render
+        elsif src_path.end_with?('.scss')
+          css_data = Sass::Engine.new(css_data,:syntax => :scss).render #, :style => :compressed).render
+          # puts css_data
+        end
+      rescue => e
+        RSence.plugin_manager.plugin_error(
+          e,
+          'SASS Error',
+          "An error occurred while parsing the SASS file: #{src_path}.",
+          src_path
+        )
+        return ''
+      end
+    end
     unless @debug
       unless @no_whitespace_removal
         css_data = @html_min.minimize( css_data )
@@ -71,9 +124,9 @@ class ClientPkgBuild
           fn_args = ''
         end
         if js_type == '$'
-          js_cmds << "function(#{fn_args}){#{js_code}}"
+          js_cmds << "function(#{fn_args}){#{js_code};}"
         else
-          js_cmds << "function(#{fn_args}){return #{js_code}}"
+          js_cmds << "function(#{fn_args}){return #{js_code};}"
         end
       end
       "#{js_type}{#{seq_id}}"
@@ -128,7 +181,9 @@ class ClientPkgBuild
           :gfx => 0
         }
         theme_css = ''
-        [ File.join( src_path_theme, bundle_name+'.css' ),
+        [ File.join( src_path_theme, bundle_name+'.sass' ),
+          File.join( src_path_theme, bundle_name+'.scss' ),
+          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 )
@@ -416,7 +471,7 @@ class ClientPkgBuild
         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}})})();"
+      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
@@ -694,6 +749,7 @@ class ClientPkgBuild
   def initialize( config, logger )
 
     @coffee_supported = config[:coffee_supported]
+    @sass_supported = config[:sass_supported]
     @src_cache = {
       :path_timestamp => {},
       :path_compiled => {},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsence-pre
 version: !ruby/object:Gem::Version
-  version: 3.0.0.7
+  version: 3.0.0.8
 platform: ruby
 authors:
 - Riassence Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsence-deps