Move website specific code out of main.js and into index.html. updates #229
Otherwise, we get errors "Cannot read property top of undefined".
This commit is contained in:
parent
5a5d3d85b6
commit
c71b03094d
2
builds/converse-no-locales-no-otr.min.js
vendored
2
builds/converse-no-locales-no-otr.min.js
vendored
File diff suppressed because one or more lines are too long
2
builds/converse-no-otr.min.js
vendored
2
builds/converse-no-otr.min.js
vendored
File diff suppressed because one or more lines are too long
2
builds/converse.min.js
vendored
2
builds/converse.min.js
vendored
File diff suppressed because one or more lines are too long
2
builds/converse.website-no-otr.min.js
vendored
2
builds/converse.website-no-otr.min.js
vendored
File diff suppressed because one or more lines are too long
2
builds/converse.website.min.js
vendored
2
builds/converse.website.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -5,6 +5,7 @@ Changelog
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
* Bugfix. Error when trying to use prebind and keepalive together. [jcbrand]
|
* Bugfix. Error when trying to use prebind and keepalive together. [jcbrand]
|
||||||
|
* Bugfix. Cannot read property "top" of undefined. [jcbrand]
|
||||||
|
|
||||||
0.8.3 (2014-09-22)
|
0.8.3 (2014-09-22)
|
||||||
------------------
|
------------------
|
||||||
|
|
22
index.html
22
index.html
|
@ -233,6 +233,28 @@
|
||||||
<script>
|
<script>
|
||||||
// Configuration loaded, so safe to make other require calls.
|
// Configuration loaded, so safe to make other require calls.
|
||||||
require(['converse'], function (converse) {
|
require(['converse'], function (converse) {
|
||||||
|
(function () {
|
||||||
|
/* XXX: This function initializes jquery.easing for the https://conversejs.org
|
||||||
|
* website. This code is only useful in the context of the converse.js
|
||||||
|
* website and converse.js itself is NOT dependent on it.
|
||||||
|
*/
|
||||||
|
$(window).scroll(function() {
|
||||||
|
if ($(".navbar").offset().top > 50) {
|
||||||
|
$(".navbar-fixed-top").addClass("top-nav-collapse");
|
||||||
|
} else {
|
||||||
|
$(".navbar-fixed-top").removeClass("top-nav-collapse");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
//jQuery for page scrolling feature - requires jQuery Easing plugin
|
||||||
|
$('.page-scroll a').bind('click', function(event) {
|
||||||
|
var $anchor = $(this);
|
||||||
|
$('html, body').stop().animate({
|
||||||
|
scrollTop: $($anchor.attr('href')).offset().top
|
||||||
|
}, 700, 'easeInOutExpo');
|
||||||
|
event.preventDefault();
|
||||||
|
});
|
||||||
|
})();
|
||||||
|
|
||||||
converse.initialize({
|
converse.initialize({
|
||||||
bosh_service_url: 'https://bind.conversejs.org', // Please use this connection manager only for testing purposes
|
bosh_service_url: 'https://bind.conversejs.org', // Please use this connection manager only for testing purposes
|
||||||
i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported
|
i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported
|
||||||
|
|
23
main.js
23
main.js
|
@ -151,32 +151,9 @@ config = {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
var initializeEasing = function () {
|
|
||||||
/* XXX: This function initializes jquery.easing for the https://conversejs.org
|
|
||||||
* website. This code is only useful in the context of the converse.js
|
|
||||||
* website and converse.js itself is not dependent on it.
|
|
||||||
*/
|
|
||||||
$(window).scroll(function() {
|
|
||||||
if ($(".navbar").offset().top > 50) {
|
|
||||||
$(".navbar-fixed-top").addClass("top-nav-collapse");
|
|
||||||
} else {
|
|
||||||
$(".navbar-fixed-top").removeClass("top-nav-collapse");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
//jQuery for page scrolling feature - requires jQuery Easing plugin
|
|
||||||
$('.page-scroll a').bind('click', function(event) {
|
|
||||||
var $anchor = $(this);
|
|
||||||
$('html, body').stop().animate({
|
|
||||||
scrollTop: $($anchor.attr('href')).offset().top
|
|
||||||
}, 700, 'easeInOutExpo');
|
|
||||||
event.preventDefault();
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
if (typeof(require) !== 'undefined') {
|
if (typeof(require) !== 'undefined') {
|
||||||
require.config(config);
|
require.config(config);
|
||||||
require(["jquery", "converse"], function($, converse) {
|
require(["jquery", "converse"], function($, converse) {
|
||||||
window.converse = converse;
|
window.converse = converse;
|
||||||
initializeEasing(); // Only for https://conversejs.org website
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user