Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'asset_path_version_public_folder' of https://github.com…

…/grundprinzip/showoff into grundprinzip-asset_path_version_public_folder

Conflicts:
	lib/showoff.rb
  • Loading branch information...
commit 0657b2d6e714f61b44784c53ba31f9f879a5f3a2 2 parents 0384f7b + b3f337d
Gonçalo Silva goncalossilva authored
Showing with 7 additions and 1 deletion.
  1. +2 −1  bin/showoff
  2. +3 −0  lib/showoff.rb
  3. +2 −0  lib/showoff_utils.rb
3  bin/showoff
View
@@ -2,12 +2,13 @@
$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
require 'showoff'
+require 'showoff/version'
require 'rubygems'
require 'gli'
include GLI
-version ShowOff::Version
+version SHOWOFF_VERSION
desc 'Create new showoff presentation'
arg_name 'dir_name'
3  lib/showoff.rb
View
@@ -55,6 +55,9 @@ def initialize(app=nil)
@logger.debug settings.pres_dir
@pres_name = settings.pres_dir.split('/').pop
require_ruby_files
+
+ # Default asset path
+ @asset_path = "./"
end
def self.pres_dir_current
2  lib/showoff_utils.rb
View
@@ -293,6 +293,8 @@ def self.get_config_option(dir, option, default = nil)
data[option] || default
end
end
+ else
+ default
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.