jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge master for site tweaks

Browse source
This commit is contained in:
Garen Torikian 2012-09-17 11:28:50 -07:00
commit f66b365f35
7 changed files with 98 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

40
doc/site/js/main.js
View file

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

12
doc/site/style.css
View file

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