Skip to content

Commit

Permalink
modified to load locally placed lwf*.js.
Browse files Browse the repository at this point in the history
  • Loading branch information
KojiNakamaru committed Mar 12, 2014
1 parent e13a288 commit 600872f
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions lwfs.rb
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,11 @@ def outputOK(update_time, folder, name, prefix, commandline)
lwfjs = 'lwf.js'
end
['release', 'debug', 'birdwatcher'].each do |rel|
if rel == 'release' and File.exists?("#{folder}/#{lwfjs}")
lwfjs_prefix = "."
else
lwfjs_prefix = "#{root_override}#{(rel == 'release') ? 'js' : 'js_debug'}"
end
birdwatcher = ''
if rel == 'birdwatcher'
birdwatcher = <<-"EOF"
Expand Down Expand Up @@ -934,15 +939,15 @@ def outputOK(update_time, folder, name, prefix, commandline)
<link rel="stylesheet" href="#{relative}css/viewer.css" />
<script type="text/javascript" src="#{relative}js/ajax.js"></script>
<script type="text/javascript" src="#{relative}js/qrcode.js"></script>
<script type="text/javascript" src="#{root_override}#{(rel == 'release') ? 'js' : 'js_debug'}/#{lwfjs}"></script>
<script type="text/javascript" src="#{lwfjs_prefix}/#{lwfjs}"></script>
<script type="text/javascript">
window["testlwf_root_override"] = "#{root_override}";
window["testlwf_name"] = "#{name}";
window["testlwf_html5target"] = "#{target}";
window["testlwf_commandline"] = "#{commandline}";
window["testlwf_warn"] = #{warnings != ''};
window["testlwf_lwf"] = "_/#{prefix}.lwf";
window["testlwf_lwfjs"] = "#{lwfjs}";
window["testlwf_lwfjs"] = "#{lwfjs_prefix}/#{lwfjs}";
window["testlwf_lwfstats"] = {
"w": #{lwfstats[:w]},
"h": #{lwfstats[:h]},
Expand Down Expand Up @@ -971,6 +976,7 @@ def outputOK(update_time, folder, name, prefix, commandline)
"graph": #{STATS_DISPLAY['GRAPH']},
"text": #{STATS_DISPLAY['TEXT']}
};
window["testlwf_settings"] = {};
</script>
<script type="text/javascript" src="#{relative}js/test-html5.js"></script>
#{(loaderscripts + userscripts).chomp}
Expand Down

0 comments on commit 600872f

Please sign in to comment.