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:
JC Brand 2014-09-26 11:30:56 +02:00
parent 5a5d3d85b6
commit c71b03094d
8 changed files with 28 additions and 28 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -5,6 +5,7 @@ Changelog
------------------
* 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)
------------------

View File

@ -233,6 +233,28 @@
<script>
// Configuration loaded, so safe to make other require calls.
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({
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

23
main.js
View File

@ -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') {
require.config(config);
require(["jquery", "converse"], function($, converse) {
window.converse = converse;
initializeEasing(); // Only for https://conversejs.org website
});
}