diff --git a/api/editor.html b/api/editor.html index a7798f30df9..f2493025eeb 100644 --- a/api/editor.html +++ b/api/editor.html @@ -1,4 +1,4 @@ -

Editor [edit]

The main entry point into the Ace functionality. The Editor manages the EditSession (which manages Documents), as well as the VirtualRenderer, which draws everything to the screen. Event sessions dealing with the mouse and keyboard are bubbled up from Document to the Editor, which decides what to do with them.

+

Editor [edit]

The main entry point into the Ace functionality. The Editor manages the EditSession (which manages Documents), as well as the VirtualRenderer, which draws everything to the screen. Event sessions dealing with the mouse and keyboard are bubbled up from Document to the Editor, which decides what to do with them.

Constructors

Creates a new Editor object.

Creates a new Editor object.

Arguments

rendererVirtualRenderer

Required. Associated VirtualRenderer that draws everything

@@ -35,7 +35,9 @@

Arguments

    • Editor.$updateHighlightActiveLine()
    • Internal
    • Editor.addSelectionMarker(Range orientedRange)

    Adds the selection and cursor.

    Adds the selection and cursor.

    Arguments

    orientedRangeRange

    Required. A range containing a cursor

    -
      • Editor.blockOutdent()
      • Related to:

    Outdents the current line.

    +
      • Editor.alignCursors()

      aligns cursors or selected text

      +

      aligns cursors or selected text

      +
        • Editor.blockOutdent()
        • Related to:

      Outdents the current line.

      Outdents the current line.

        • Editor.blur()

        Blurs the current textInput.

        Blurs the current textInput.

        diff --git a/api/resources/csses/ace_api.css b/api/resources/csses/ace_api.css index f849dcf7524..f28658cc938 100644 --- a/api/resources/csses/ace_api.css +++ b/api/resources/csses/ace_api.css @@ -147,6 +147,16 @@ form.navbar-search { form.navbar-search .search-query { background-color: #FFFFFF; + border-color: #999; + -webkit-transition: border 0.3s; + -moz-transition: border 0.3s; + font-size: 14px; + line-height: 16px; +} + +form.navbar-search .search-query:focus, form.navbar-search .search-query:active { + border: 1px solid #666; + padding: 4px 9px; } h3.api_title { @@ -154,24 +164,28 @@ h3.api_title { } ul.menu { - margin-left: 16px; + margin-left: 2px; } .menu li { list-style-image: url(../images/menu_disc.png); - margin-bottom: 3px; - font-weight : 700; + margin-bottom: 4px; + font-weight: 700; + padding-left: 10px; + margin-left: 0; } .menu li .menu-item a.menuLink, .menu li .menu-item span.menuLink { - color: #262626; + color: #3E7096; + font-weight: 100; } .menuTwo { margin-bottom: 5px; margin-top: 2px; } .menuTwo li .menu-item a.menuLink { - color: #262626; + color: #3E7096; + font-weight: 100; } /* need specificity to "beat" the above colors */ @@ -494,6 +508,7 @@ header.filler { .centerpiece { background: url(../images/sidebar_border.png) repeat-y 230px 0; min-height: 100%; + padding: 10px 0; } /* @@ -535,6 +550,9 @@ header.filler { #documentation article.article { border-top: 1px solid #e9e9e9; padding: 16px 10px 2px; + -webkit-transition: padding 0.2s; + -moz-transition: padding 0.2s; + -o-transition: padding 0.2s; } #documentation h3.sectionHeader + article.article { @@ -781,7 +799,7 @@ li.signature { #documentation i.methodToggle { cursor: pointer; color: #9f9f9f; - padding-top: 5px; + padding-top: 2px; float: left; } #documentation i.methodToggle.methodToggleHover { @@ -802,6 +820,7 @@ li.signature { /* Opera */ -o-transform: rotate(45deg); + padding-top: 9px; } #documentation h3.sectionHeader { diff --git a/api/resources/javascripts/clicker.js b/api/resources/javascripts/clicker.js index b5a86168141..d37cf253e7f 100644 --- a/api/resources/javascripts/clicker.js +++ b/api/resources/javascripts/clicker.js @@ -28,7 +28,10 @@ function setupClicker() { if (!$article.hasClass('methodToggleOpen') || this.force) { $article.addClass('methodToggleOpen'); $arrow.removeClass('inactive').addClass('active'); - + + if (!$arrow[0]) + return; + var data = $arrow[0].id.replace(/^js_/, ""); //var state = {}; //state.section = data; @@ -58,7 +61,7 @@ function setupClicker() { // for the top dropdown $('li.memberLink a').click(transformHash); - //$('a[href^="#"]').click(transformHash); + $('a[href^="#"]').click(transformHash); $('.related-to', '.metaInfo').click(function(){ location.hash = $(this).find('a').attr('href').split('#')[1]; diff --git a/doc/resources/ace/skeleton/csses/ace_api.css b/doc/resources/ace/skeleton/csses/ace_api.css index f849dcf7524..f28658cc938 100644 --- a/doc/resources/ace/skeleton/csses/ace_api.css +++ b/doc/resources/ace/skeleton/csses/ace_api.css @@ -147,6 +147,16 @@ form.navbar-search { form.navbar-search .search-query { background-color: #FFFFFF; + border-color: #999; + -webkit-transition: border 0.3s; + -moz-transition: border 0.3s; + font-size: 14px; + line-height: 16px; +} + +form.navbar-search .search-query:focus, form.navbar-search .search-query:active { + border: 1px solid #666; + padding: 4px 9px; } h3.api_title { @@ -154,24 +164,28 @@ h3.api_title { } ul.menu { - margin-left: 16px; + margin-left: 2px; } .menu li { list-style-image: url(../images/menu_disc.png); - margin-bottom: 3px; - font-weight : 700; + margin-bottom: 4px; + font-weight: 700; + padding-left: 10px; + margin-left: 0; } .menu li .menu-item a.menuLink, .menu li .menu-item span.menuLink { - color: #262626; + color: #3E7096; + font-weight: 100; } .menuTwo { margin-bottom: 5px; margin-top: 2px; } .menuTwo li .menu-item a.menuLink { - color: #262626; + color: #3E7096; + font-weight: 100; } /* need specificity to "beat" the above colors */ @@ -494,6 +508,7 @@ header.filler { .centerpiece { background: url(../images/sidebar_border.png) repeat-y 230px 0; min-height: 100%; + padding: 10px 0; } /* @@ -535,6 +550,9 @@ header.filler { #documentation article.article { border-top: 1px solid #e9e9e9; padding: 16px 10px 2px; + -webkit-transition: padding 0.2s; + -moz-transition: padding 0.2s; + -o-transition: padding 0.2s; } #documentation h3.sectionHeader + article.article { @@ -781,7 +799,7 @@ li.signature { #documentation i.methodToggle { cursor: pointer; color: #9f9f9f; - padding-top: 5px; + padding-top: 2px; float: left; } #documentation i.methodToggle.methodToggleHover { @@ -802,6 +820,7 @@ li.signature { /* Opera */ -o-transform: rotate(45deg); + padding-top: 9px; } #documentation h3.sectionHeader { diff --git a/doc/resources/ace/skeleton/javascripts/clicker.js b/doc/resources/ace/skeleton/javascripts/clicker.js index ddffe5202bb..d37cf253e7f 100644 --- a/doc/resources/ace/skeleton/javascripts/clicker.js +++ b/doc/resources/ace/skeleton/javascripts/clicker.js @@ -28,7 +28,10 @@ function setupClicker() { if (!$article.hasClass('methodToggleOpen') || this.force) { $article.addClass('methodToggleOpen'); $arrow.removeClass('inactive').addClass('active'); - + + if (!$arrow[0]) + return; + var data = $arrow[0].id.replace(/^js_/, ""); //var state = {}; //state.section = data; diff --git a/doc/site/style.css b/doc/site/style.css index 273a9f5b133..8f68d36d862 100644 --- a/doc/site/style.css +++ b/doc/site/style.css @@ -473,5 +473,9 @@ p.highlight_note a { } #sidebarContainer { - margin: 0 20px 0 0; + margin: 3px 20px 0 15px; +} + +#api { + padding: 0; } \ No newline at end of file