浏览代码

Move website specific code out of main.js and into index.html. updates #229

Otherwise, we get errors "Cannot read property top of undefined".
JC Brand 10 年之前
父节点
当前提交
c71b03094d

文件差异内容过多而无法显示
+ 0 - 0
builds/converse-no-locales-no-otr.min.js


文件差异内容过多而无法显示
+ 0 - 0
builds/converse-no-otr.min.js


文件差异内容过多而无法显示
+ 0 - 0
builds/converse.min.js


文件差异内容过多而无法显示
+ 0 - 0
builds/converse.website-no-otr.min.js


文件差异内容过多而无法显示
+ 0 - 0
builds/converse.website.min.js


+ 1 - 0
docs/CHANGES.rst

@@ -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)
 ------------------

+ 22 - 0
index.html

@@ -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

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

部分文件因为文件数量过多而无法显示