Home Explore Help
Register Sign In
im-changing.ru
/
converse.js
mirror of https://github.com/conversejs/converse.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Two website deps (jquery-easing & bootstrap) now managed by bower

JC Brand 11 years ago
parent
166b3bd003
commit
9d84ede2f9
7 changed files with 34 additions and 27 deletions
Unified View Show Diff Stats
  1. 3 1
      bower.json
  2. 1 4
      index.html
  3. 0 19
      js/init.js
  4. 0 1
      js/jquery.min.js
  5. 0 1
      js/skel.min.js
  6. 28 1
      main.js
  7. 2 0
      src/deps-full.js

+ 3 - 1
bower.json
View File 

@@ -27,7 +27,9 @@
 
     "requirejs-text": "~2.0.12",
 
     "requirejs-text": "~2.0.12",
 
     "requirejs-tpl-jcbrand": "*",
 
     "requirejs-tpl-jcbrand": "*",
 
     "momentjs": "~2.6.0",
 
     "momentjs": "~2.6.0",
 
-    "jquery.browser": "~0.0.6"
 
+    "jquery.browser": "~0.0.6",
 
+    "jquery-easing-original": "~1.3.1",
 
+    "bootstrap": "~3.2.0"
 
   },
 
   },
 
   "exportsOverride": {}
 
   "exportsOverride": {}
 
 }
 
 }

+ 1 - 4
index.html
View File 

@@ -16,10 +16,6 @@
 
     <!--
 
     <!--
 
     <script src="builds/converse.min.js"></script>
 
     <script src="builds/converse.min.js"></script>
 
     -->
 
     -->
 
-
 
-    <script src="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
 
-    <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js"></script>
 
-    <script src="js/init.js"></script>
 
 </head>
 
 </head>
 
 
 
 <body id="page-top" data-spy="scroll" data-target=".navbar-custom">
 
 <body id="page-top" data-spy="scroll" data-target=".navbar-custom">
 
@@ -223,6 +219,7 @@
 
     document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
 
     document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
 
 </script>
 
 </script>
 
 <script type="text/javascript">try { var pageTracker = _gat._getTracker("UA-2128260-8"); pageTracker._trackPageview(); } catch(err) {}</script>
 
 <script type="text/javascript">try { var pageTracker = _gat._getTracker("UA-2128260-8"); pageTracker._trackPageview(); } catch(err) {}</script>
 
+
 
 <script>
 
 <script>
 
     require(['converse'], function (converse) {
 
     require(['converse'], function (converse) {
 
         converse.initialize({
 
         converse.initialize({

+ 0 - 19
js/init.js
View File 

@@ -1,19 +0,0 @@
 
-//jQuery to collapse the navbar on scroll

-$(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

-$(function() {

-    $('.page-scroll a').bind('click', function(event) {

-        var $anchor = $(this);

-        $('html, body').stop().animate({

-            scrollTop: $($anchor.attr('href')).offset().top

-        }, 700, 'easeInOutExpo');

-        event.preventDefault();

-    });

-});

File diff suppressed because it is too large
+ 0 - 1
js/jquery.min.js


File diff suppressed because it is too large
+ 0 - 1
js/skel.min.js


+ 28 - 1
main.js
View File 

@@ -4,6 +4,8 @@ config = {
 
         "jquery": "components/jquery/dist/jquery",
 
         "jquery": "components/jquery/dist/jquery",
 
         "jquery.tinysort": "components/tinysort/src/jquery.tinysort",
 
         "jquery.tinysort": "components/tinysort/src/jquery.tinysort",
 
         "jquery.browser": "components/jquery.browser/dist/jquery.browser",
 
         "jquery.browser": "components/jquery.browser/dist/jquery.browser",
 
+        "jquery.easing": "components/jquery-easing-original/jquery.easing.1.3", // XXX: Only required for https://conversejs.org website
 
+        "bootstrap": "components/bootstrap/dist/js/bootstrap",                  // XXX: Only required for https://conversejs.org website
 
         "locales": "locale/locales",
 
         "locales": "locale/locales",
 
         "underscore": "components/underscore/underscore",
 
         "underscore": "components/underscore/underscore",
 
         "backbone": "components/backbone/backbone",
 
         "backbone": "components/backbone/backbone",
 
@@ -59,6 +61,7 @@ config = {
 
             exports: 'Backbone'
 
             exports: 'Backbone'
 
         },
 
         },
 
         'underscore':           { exports: '_' },
 
         'underscore':           { exports: '_' },
 
+        'bootstrap':            { deps: ['jquery'] },
 
         'crypto.aes':           { deps: ['crypto.cipher-core'] },
 
         'crypto.aes':           { deps: ['crypto.cipher-core'] },
 
         'crypto.cipher-core':   { deps: ['crypto.enc-base64', 'crypto.evpkdf'] },
 
         'crypto.cipher-core':   { deps: ['crypto.enc-base64', 'crypto.evpkdf'] },
 
         'crypto.enc-base64':    { deps: ['crypto.core'] },
 
         'crypto.enc-base64':    { deps: ['crypto.core'] },
 
@@ -71,6 +74,7 @@ config = {
 
         'crypto.sha256':        { deps: ['crypto.core'] },
 
         'crypto.sha256':        { deps: ['crypto.core'] },
 
         'jquery.tinysort':      { deps: ['jquery'] },
 
         'jquery.tinysort':      { deps: ['jquery'] },
 
         'jquery.browser':       { deps: ['jquery'] },
 
         'jquery.browser':       { deps: ['jquery'] },
 
+        'jquery.easing':        { deps: ['jquery'] },
 
         'strophe':              { deps: ['jquery'] },
 
         'strophe':              { deps: ['jquery'] },
 
         'strophe.disco':        { deps: ['strophe'] },
 
         'strophe.disco':        { deps: ['strophe'] },
 
         'strophe.muc':          { deps: ['strophe', 'jquery'] },
 
         'strophe.muc':          { deps: ['strophe', 'jquery'] },
 
@@ -79,9 +83,32 @@ 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(require, $, converse) {
 
+    require(["jquery", "converse"], function($, converse) {
 
         window.converse = converse;
 
         window.converse = converse;
 
+        initializeEasing(); // Only for https://conversejs.org website
 
     });
 
     });
 
 }
 
 }

+ 2 - 0
src/deps-full.js
View File 

@@ -2,10 +2,12 @@ define("converse-dependencies", [
 
     "otr",
 
     "otr",
 
     "moment",
 
     "moment",
 
     "locales",
 
     "locales",
 
+    "bootstrap",
 
     "backbone.browserStorage",
 
     "backbone.browserStorage",
 
     "backbone.overview",
 
     "backbone.overview",
 
     "jquery.tinysort",
 
     "jquery.tinysort",
 
     "jquery.browser",
 
     "jquery.browser",
 
+    "jquery.easing",
 
     "strophe",
 
     "strophe",
 
     "strophe.muc",
 
     "strophe.muc",
 
     "strophe.roster",
 
     "strophe.roster",

Some files were not shown because too many files changed in this diff