diff --git a/api/resources/javascripts/disqus-ext.js b/api/resources/javascripts/disqus-ext.js index 66da8bfc..6bb7ff4e 100644 --- a/api/resources/javascripts/disqus-ext.js +++ b/api/resources/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); + } })(); } \ No newline at end of file diff --git a/doc/resources/ace/skeleton/javascripts/disqus-ext.js b/doc/resources/ace/skeleton/javascripts/disqus-ext.js index 66da8bfc..6bb7ff4e 100644 --- a/doc/resources/ace/skeleton/javascripts/disqus-ext.js +++ b/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); + } })(); } \ No newline at end of file diff --git a/doc/site/js/main.js b/doc/site/js/main.js index e4f78ffc..d2da9c35 100644 --- a/doc/site/js/main.js +++ b/doc/site/js/main.js @@ -14,7 +14,7 @@ $(function() { 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"); } @@ -23,34 +23,12 @@ $(function() { // used when page is access directly function magicClickInterceptor(e) { e.preventDefault(); - - var state = {}; - state.api = $(this).attr("href").substring(6, $(this).attr("href").length - 5); - $.bbq.pushState(state); - - $("#apiHolder").removeClass("apiIntro").removeClass("span8"); - $("#apiHolder").load($(this).attr("href") + " #documentation", function(){ - ux(); - setupClicker(); - - // handles dropping in from new link - var section = $.bbq.getState("section"); - if (section) { - $("li#dropdown_" + section.replace(/\./g, '\\.') + " a").triggerHandler('click'); - } - - setupDisqus(); - }); - } - - $('.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); + var _self = $(this); $("#apiHolder").load($(this).attr("href") + " #documentation", function(){ $("#apiHolder").removeClass("apiIntro").removeClass("span8"); ux(); @@ -62,9 +40,12 @@ $(function() { $("li#dropdown_" + section.replace(/\./g, '\\.') + " a").triggerHandler('click'); } - setupDisqus(); + //setupDisqus(_self.attr("href")); }); - }); + } + + $('.menu-item a').click(magicClickInterceptor); + $('a.argument').click(magicClickInterceptor); var tabs = $("#tabnav"), tab_a_selector = "a"; diff --git a/doc/site/style.css b/doc/site/style.css index 40118ed5..11e8eaec 100644 --- a/doc/site/style.css +++ b/doc/site/style.css @@ -462,4 +462,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; } \ No newline at end of file diff --git a/index.html b/index.html index 90dceff1..e1b27a1e 100644 --- a/index.html +++ b/index.html @@ -163,7 +163,7 @@ console.log(addResult); return x; }</div> -<script src="src-noconflict/ace.js" type="text/javascript" charset="utf-8"></script> +<script src="https://s3.amazonaws.com/ajaxorg/src-min-noconflict/ace.js" type="text/javascript" charset="utf-8"></script> <script> var editor = ace.edit("editor"); editor.setTheme("ace/theme/twilight"); @@ -189,13 +189,11 @@ console.log(addResult);

Themes are loaded on demand; all you have to do is pass the string name:

editor.setTheme("ace/theme/twilight");
-

> (See all themes)

+

> See all themes

Setting the Programming Language Mode

By default, the editor supports plain text mode. All other language modes are available as separate modules, loaded on demand like this:

- - 
<script src="src/mode-javascript.js" type="text/javascript" charset="utf-8">
-

The mode can then be used like this:

var javascriptMode = require("ace/mode/javascript").Mode;
 editor.getSession().setMode(new javascriptMode());
@@ -212,7 +210,7 @@ var css = new EditSession(["some", "css", "code here"]); editor.setSession(js);

Common Operations

-

Set and get content:`

+

Set and get content:

editor.setValue("the new text here"); // or session.setValue
 editor.getValue(); // or session.getValue
@@ -470,60 +468,98 @@ tests for the highlighting.

style="position: relative; left: 19px; top: 2px;" /> RStudio -
  • Sky Edit
  • + class="prod_no_image" /> + Sky Edit +
    • +
  • + WaveMaker
  • + Play My Code
  • + Qooxdoo playground
  • + Radiant CMS
  • + Developer Companion
  • + PythonAnywhere
  • + shiftEdit
  • + Akshell
  • + beanstalk
  • + Neutron IDE
  • + Acebug
  • + Weecod
  • + RubyMonk
  • + tmpltr
  • + CMS Made Simple
  • + Try Jasmine
  • + Codebender
  • + ShareLaTeX