improvements to surf mode

This commit is contained in:
Kyle Drake 2015-03-25 14:44:39 -07:00
parent 3a157b697f
commit 2c3441d791
2 changed files with 18 additions and 14 deletions

View file

@ -44,9 +44,13 @@ get %r{\/surf\/proxy\/([\w-]+)\/(.+)|\/surf\/proxy\/([\w-]+)\/?} do
new_ele = nil new_ele = nil
if uri.match /^\// if uri.match(/^\w+:\/\/|^\/\//i)
new_ele = ele.gsub(uri, "#{$config['surf_proxy_uri']}/surf/proxy/#{site.username}#{uri}") if ele.match(/^href/i)
elsif !uri.match /^\w+:\/\// new_ele = ele + ' target="_blank"'
else
new_ele = ele
end
else
new_ele = ele.gsub(uri, "#{$config['surf_proxy_uri']}/surf/proxy/#{site.username}/#{uri}") new_ele = ele.gsub(uri, "#{$config['surf_proxy_uri']}/surf/proxy/#{site.username}/#{uri}")
end end

View file

@ -237,7 +237,7 @@
</ul> </ul>
</div> </div>
<iframe src="//<%= @site.host %>" frameborder="0" scrolling="yes" marginheight="0" marginwidth="0" id="website-frame" name="website-frame"></iframe> <iframe src="<%= "#{$config['surf_proxy_uri']}/surf/proxy/#{@site.username}" %>" frameborder="0" scrolling="yes" marginheight="0" marginwidth="0" id="website-frame" name="website-frame"></iframe>
<script src="/js/jquery-1.11.0.min.js"></script> <script src="/js/jquery-1.11.0.min.js"></script>
<script src="/js/bootstrap.min.js"></script> <script src="/js/bootstrap.min.js"></script>