cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblot...@apache.org
Subject docs commit: Fixing includes to perform better. Renaming plugins container with a more descriptive name (i.e. 'pluginsAppContainer'). Moving Slack script back; turns out it inserts the button at the place where it's included.
Date Thu, 10 Sep 2015 01:41:35 GMT
Repository: cordova-docs
Updated Branches:
  refs/heads/cordova-website da06b8b5d -> 31ee778fc


Fixing includes to perform better. Renaming plugins container with a more descriptive name
(i.e. 'pluginsAppContainer'). Moving Slack script back; turns out it inserts the button at
the place where it's included.


Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/31ee778f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/31ee778f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/31ee778f

Branch: refs/heads/cordova-website
Commit: 31ee778fc58de51edf09df90f8f1b9bcffbe530f
Parents: da06b8b
Author: Dmitry Blotsky <dmitry.blotsky@gmail.com>
Authored: Wed Sep 9 18:41:28 2015 -0700
Committer: Dmitry Blotsky <dmitry.blotsky@gmail.com>
Committed: Wed Sep 9 18:41:28 2015 -0700

----------------------------------------------------------------------
 www/_includes/footer.html             | 5 +++++
 www/_includes/head.html               | 4 +++-
 www/_includes/scripts.html            | 9 ---------
 www/_layouts/docs.html                | 1 +
 www/plugins/index.html                | 3 +--
 www/static/js/plugins-page.js         | 3 ---
 www/static/plugins/app.js             | 5 ++++-
 www/static/plugins/platformbutton.jsx | 2 +-
 www/static/plugins/sortbutton.jsx     | 2 +-
 9 files changed, 16 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/31ee778f/www/_includes/footer.html
----------------------------------------------------------------------
diff --git a/www/_includes/footer.html b/www/_includes/footer.html
index 5402609..af78438 100644
--- a/www/_includes/footer.html
+++ b/www/_includes/footer.html
@@ -55,6 +55,7 @@
                     Learn More
                 </a>
                 <p style="padding-top:20px"> <a href="https://twitter.com/apachecordova"
class="twitter-follow-button" data-show-count="false">Follow @apachecordova</a></p>
+                <script async defer src="http://slack.cordova.io/slackin.js"></script>
             </div>
         </div>
         <p class="copyright_text">
@@ -64,3 +65,7 @@
         <a class="closing" href="#top"></a>
     </div>
 </footer>
+
+<script async type="text/javascript" src="{{ site.baseurl }}/static/js/main.js"></script>
+<script async type="text/javascript" src="{{ site.baseurl }}/static/js/index.js"></script>
+<script async type="text/javascript" src="{{ site.baseurl }}/static/js/twitter.js"></script>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/31ee778f/www/_includes/head.html
----------------------------------------------------------------------
diff --git a/www/_includes/head.html b/www/_includes/head.html
index c8710c5..d0d3f69 100644
--- a/www/_includes/head.html
+++ b/www/_includes/head.html
@@ -24,5 +24,7 @@
     </script>
 
     <!-- JS -->
-    {% include scripts.html %}
+    <script defer type="text/javascript" src="{{ site.baseurl }}/static/js/lib/jquery-2.1.1.min.js"></script>
+    <script defer type="text/javascript" src="{{ site.baseurl }}/static/js/lib/bootstrap.min.js"></script>
+    <script defer type="text/javascript" src="{{ site.baseurl }}/static/js/lib/ZeroClipboard.js"></script>
 </head>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/31ee778f/www/_includes/scripts.html
----------------------------------------------------------------------
diff --git a/www/_includes/scripts.html b/www/_includes/scripts.html
deleted file mode 100644
index 2e3171d..0000000
--- a/www/_includes/scripts.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<script type="text/javascript" src="{{ site.baseurl }}/static/js/lib/jquery-2.1.1.min.js"
defer></script>
-<script type="text/javascript" src="{{ site.baseurl }}/static/js/lib/bootstrap.min.js"
defer></script>
-<script type="text/javascript" src="{{ site.baseurl }}/static/js/lib/toc.min.js" defer></script>
-<script type="text/javascript" src="{{ site.baseurl }}/static/js/lib/ZeroClipboard.js"
defer></script>
-<script type="text/javascript" src="{{ site.baseurl }}/static/js/main.js" defer></script>
-<script type="text/javascript" src="{{ site.baseurl }}/static/js/index.js" defer></script>
-<script type="text/javascript" src="{{ site.baseurl }}/static/js/twitter.js" defer></script>
-
-<script src="http://slack.cordova.io/slackin.js" defer></script>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/31ee778f/www/_layouts/docs.html
----------------------------------------------------------------------
diff --git a/www/_layouts/docs.html b/www/_layouts/docs.html
index a8c41ab..bab0bfa 100644
--- a/www/_layouts/docs.html
+++ b/www/_layouts/docs.html
@@ -159,4 +159,5 @@ analytics_id: UA-64283057-1
     </div>
 </div>
 
+<script type="text/javascript" src="{{ site.baseurl }}/static/js/lib/toc.min.js" defer></script>
 <script type="text/javascript" src="{{ site.baseurl }}/static/js/docs.js" defer></script>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/31ee778f/www/plugins/index.html
----------------------------------------------------------------------
diff --git a/www/plugins/index.html b/www/plugins/index.html
index e7a5739..12b49c2 100644
--- a/www/plugins/index.html
+++ b/www/plugins/index.html
@@ -7,8 +7,7 @@ description: Search here for Apache Cordova plugins published on NPM.
 
 <!-- Main jumbotron for a primary marketing message or call to action -->
 <div class="container">
-    <div id="container"></div>
+    <div id="pluginsAppContainer"></div>
 </div>
 
 <script type="text/javascript" src="{{ site.baseurl }}/static/js/plugins.js" defer></script>
-<script type="text/javascript" src="{{ site.baseurl }}/static/js/plugins-page.js" defer></script>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/31ee778f/www/static/js/plugins-page.js
----------------------------------------------------------------------
diff --git a/www/static/js/plugins-page.js b/www/static/js/plugins-page.js
deleted file mode 100644
index 7fed270..0000000
--- a/www/static/js/plugins-page.js
+++ /dev/null
@@ -1,3 +0,0 @@
-$(document).ready(function () {
-    App.start();
-});

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/31ee778f/www/static/plugins/app.js
----------------------------------------------------------------------
diff --git a/www/static/plugins/app.js b/www/static/plugins/app.js
index f02e163..2707d13 100755
--- a/www/static/plugins/app.js
+++ b/www/static/plugins/app.js
@@ -483,7 +483,7 @@ var App = React.createClass({
 });
 
 App.start = function() {
-    React.render(<App />, document.getElementById('container'));
+    React.render(<App />, document.getElementById('pluginsAppContainer'));
 };
 
 function delay(callback, ms){
@@ -509,3 +509,6 @@ function xhrRequest(url, success, fail) {
 }
 
 module.exports = window.App = App;
+
+// run the app
+App.start();

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/31ee778f/www/static/plugins/platformbutton.jsx
----------------------------------------------------------------------
diff --git a/www/static/plugins/platformbutton.jsx b/www/static/plugins/platformbutton.jsx
index 0bcd42f..071602d 100755
--- a/www/static/plugins/platformbutton.jsx
+++ b/www/static/plugins/platformbutton.jsx
@@ -7,7 +7,7 @@ var PlatformButton = React.createClass({
         };
     },
     onClick: function() {
-        var appInstance = React.render(<App />, document.getElementById('container'));
+        var appInstance = React.render(<App />, document.getElementById('pluginsAppContainer'));
         appInstance.toggleCondition('platforms', this.props.keyword);
         this.setState(function(prevState, currentProps) {
             return {

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/31ee778f/www/static/plugins/sortbutton.jsx
----------------------------------------------------------------------
diff --git a/www/static/plugins/sortbutton.jsx b/www/static/plugins/sortbutton.jsx
index 6df3226..8d5c208 100755
--- a/www/static/plugins/sortbutton.jsx
+++ b/www/static/plugins/sortbutton.jsx
@@ -2,7 +2,7 @@ var React = require('react');
 
 var SortButton = React.createClass({
     onClick: function() {
-        var appInstance = React.render(<App />, document.getElementById('container'));
+        var appInstance = React.render(<App />, document.getElementById('pluginsAppContainer'));
         appInstance.setSort(this.props.criteria);
     },
     render: function() {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message