use protocol relative url again

This commit is contained in:
Jörg Thalheim 2013-10-05 22:54:46 +02:00
parent da99da5b6d
commit e0dd03de9f
2 changed files with 2 additions and 8 deletions

View File

@ -2,17 +2,11 @@
== stylesheet_link_tag "converse/converse.min.css" == stylesheet_link_tag "converse/converse.min.css"
== javascript_include_tag "converse.min.js" == javascript_include_tag "converse.min.js"
javascript: javascript:
var bosh_url;
if (window.location.protocol == "https:") {
bosh_url = 'https//higgsboson.tk:5281/http-bind/'
} else {}
bosh_url = 'http//higgsboson.tk:5280/http-bind/'
}
require(['converse'], function (converse) { require(['converse'], function (converse) {
converse.initialize({ converse.initialize({
auto_list_rooms: false, auto_list_rooms: false,
auto_subscribe: false, auto_subscribe: false,
bosh_service_url: bosh_url, bosh_service_url: '://higgsboson.tk/http-bind/',
hide_muc_server: false, hide_muc_server: false,
i18n: locales.en, i18n: locales.en,
prebind: false, prebind: false,

View File

@ -34,7 +34,7 @@ html.no-js.light lang="en"
meta name="twitter:image" content="http://higgsboson.tk/images/logo.png" meta name="twitter:image" content="http://higgsboson.tk/images/logo.png"
== stylesheet_link_tag "pure-min.css" == stylesheet_link_tag "pure-min.css"
== stylesheet_link_tag "site2.css" == stylesheet_link_tag "site2.css"
link href='http://fonts.googleapis.com/css?family=Maven+Pro' rel='stylesheet' type='text/css' link href='//fonts.googleapis.com/css?family=Maven+Pro' rel='stylesheet' type='text/css'
/![if IE 7] /![if IE 7]
link type="text/css" rel="stylesheet" media="screen" href="/stylesheets/fontawesome-ie7.css" link type="text/css" rel="stylesheet" media="screen" href="/stylesheets/fontawesome-ie7.css"
== yield_content :head == yield_content :head