Merge master for site tweaks

doc/resources/ace/skeleton/javascripts/disqus-ext.js

@@ -1,22 +1,17 @@
-function setupDisqus() {
+function setupDisqus(href) {
     var disqus_shortname = 'aceapi';
-    var dsqId = "disqusScript";
     
     //var paths = window.location.pathname.split("/");
     //var fileName = paths[paths.length - 2] + "/" + paths[paths.length - 1];
     
     //var disqus_identifier = fileName;
-
-    var lochash    = location.hash.substr(1);
-    var disqus_identifier = "api/" + (lochash.substr(lochash.indexOf('api=')).split('&')[0].split('=')[1] || "index") + ".html";
+    var disqus_identifier =  href.substring(2);
     
     (function() {
-        if (document.getElementById(dsqId))
-            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).removeChild(document.getElementById(dsqId));
-        
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
-        dsq.id="disqusScript";
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        if (document.getElementById("disqusScript") === null) {
+            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+            dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
+            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);       
+        }
     })();
 }

doc/site/js/main.js

@@ -4,17 +4,16 @@ $(function() {
     hljs.initHighlighting();
     editor = ace.edit("ace_editor_demo");
     embedded_editor = ace.edit("embedded_ace_code");
-    var javascriptMode = require("ace/mode/javascript").Mode;
-    var htmlMode = require("ace/mode/html").Mode;
-    editor.getSession().setMode(new javascriptMode());
-    embedded_editor.getSession().setMode(new htmlMode());
+    editor.getSession().setMode("ace/mode/javascript");
+    editor.getSession().setMode("ace/mode/javascript");
+    embedded_editor.getSession().setMode("ace/mode/html");
     
     $("ul.menu-list li").click(function(e) {
         if (e.target.tagName === "LI") {
             console.log($(this).find("a"));
             window.location = $(this).find("a").attr("href");
         }
-        else if (e.target.tagName === "P") {
+        else if (e.target.tagName === "P" || e.target.tagName === "IMG") {
             var anchor = $(e.target).siblings();
             window.location = anchor.attr("href");
         }
@@ -28,8 +27,9 @@ $(function() {
         state.api = $(this).attr("href").substring(6, $(this).attr("href").length - 5);
         $.bbq.pushState(state);
         
-        $("#apiHolder").removeClass("apiIntro").removeClass("span8");
+        var _self = $(this);
         $("#apiHolder").load($(this).attr("href") + " #documentation", function(){
+        $("#apiHolder").removeClass("apiIntro").removeClass("span8");
             ux();
             setupClicker();
         
@@ -39,32 +39,12 @@ $(function() {
                 $("li#dropdown_" + section.replace(/\./g, '\\.') + " a").triggerHandler('click');
             }
             
-            // setupDisqus();
+            //setupDisqus(_self.attr("href"));
         });
     }
     
     $('.menu-item a').click(magicClickInterceptor);
-    $('a.argument').click(function (e) {
-        e.preventDefault();
-            
-        var state = {};
-        state.api = $(this).attr("href").substring(6, $(this).attr("href").length - 5);
-        $.bbq.pushState(state);
-        
-        $("#apiHolder").load($(this).attr("href") + " #documentation", function(){
-            $("#apiHolder").removeClass("apiIntro").removeClass("span8");
-            ux();
-            setupClicker();
-        
-            // handles dropping in from new link
-            var section = $.bbq.getState("section");
-            if (section) {
-                $("li#dropdown_" + section.replace(/\./g, '\\.') + " a").triggerHandler('click');
-            }
-            
-            setupDisqus();
-        });
-    });
+    $('a.argument').click(magicClickInterceptor);
     
     $('a.external').click(function(e) {         
         e.preventDefault();
@@ -79,8 +59,10 @@ $(function() {
         e.preventDefault();
         embedded_editor.resize();
         editor.resize();
-        if ($(this).attr("href") === "/")
+        if ($(this).attr("href") === "/") {
+            window.location = "http://ace.ajax.org";
             return;
+        }
         if ($(this).attr("href").indexOf("#api") === 0) {
             $("#top_container").addClass("collapse");
             scrollIntoPosition(null, 0);

doc/site/style.css

@@ -5,6 +5,10 @@ body {
     font-family: Helvetica, Arial;
 }
 
+#embed_ace_wrapper {
+    height: 525px;
+}
+
 .ace_editor_wrapper {
     height: 275px;
     position: relative;
@@ -463,4 +467,12 @@ p.highlight_note a {
 .apiIntro {
     padding-left: 15px;
     padding-bottom: 10px;
+}
+
+.prod_no_image {
+    position: relative; left: -10px; top: -12px;
+}
+
+#sidebarContainer {
+    margin: 0 20px 0 0;
 }