Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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 3 changed files with 7 additions and 1 deletion. Show diff stats Hide diff stats

  1. +2 1  bin/showoff
  2. +3 0  lib/showoff.rb
  3. +2 0  lib/showoff_utils.rb
3  bin/showoff
@@ -2,12 +2,13 @@
2 2
3 3 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
4 4 require 'showoff'
  5 +require 'showoff/version'
5 6 require 'rubygems'
6 7 require 'gli'
7 8
8 9 include GLI
9 10
10   -version ShowOff::Version
  11 +version SHOWOFF_VERSION
11 12
12 13 desc 'Create new showoff presentation'
13 14 arg_name 'dir_name'
3  lib/showoff.rb
@@ -55,6 +55,9 @@ def initialize(app=nil)
55 55 @logger.debug settings.pres_dir
56 56 @pres_name = settings.pres_dir.split('/').pop
57 57 require_ruby_files
  58 +
  59 + # Default asset path
  60 + @asset_path = "./"
58 61 end
59 62
60 63 def self.pres_dir_current
2  lib/showoff_utils.rb
@@ -293,6 +293,8 @@ def self.get_config_option(dir, option, default = nil)
293 293 data[option] || default
294 294 end
295 295 end
  296 + else
  297 + default
296 298 end
297 299 end
298 300

0 comments on commit 0657b2d

Please sign in to comment.
Something went wrong with that request. Please try again.