Commit c41af7fc authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Differenciate methods of current class visually. 

Don't render the defined-in classname as link if the class is
current class.
parent ee5167de

lib/jsduck/renderer.rb

+7 −5
Original line number Diff line number Diff line
@@ -167,11 +167,11 @@ module JsDuck 
      first_child = is_first ? "first-child" : ""

      # shorthand to owner class

      owner = m[:owner]

      # use classname "inherited" when member is not defined in this class

      inherited = owner == @cls[:name] ? "not-inherited" : "inherited"

      # is this method inherited from parent?

      inherited = (owner != @cls[:name])



      return [

        "<div id='#{m[:id]}' class='member #{first_child} #{inherited}'>",

        "<div id='#{m[:id]}' class='member #{first_child} #{inherited ? 'inherited' : 'not-inherited'}'>",

          # leftmost column: expand button

          "<a href='#' class='side expandable'>",

            "<span>&nbsp;</span>",
@@ -179,8 +179,10 @@ module JsDuck 
          # member name and type + link to owner class and source

          "<div class='title'>",

            "<div class='meta'>",

              "<a href='#!/api/#{owner}' rel='#{owner}' class='definedIn docClass'>#{owner}</a><br/>",

              "<a href='source/#{m[:files][0][:href]}' target='_blank' class='viewSource'>view source</a>",

              inherited ? "<a href='#!/api/#{owner}' rel='#{owner}' class='defined-in docClass'>#{owner}</a>" :

                          "<span class='defined-in' rel='#{owner}'>#{owner}</span>",

              "<br/>",

              "<a href='source/#{m[:files][0][:href]}' target='_blank' class='view-source'>view source</a>",

            "</div>",

            # method params signature or property type signature

            render_signature(m),

template/app/controller/Classes.js

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ Ext.define('Docs.controller.Classes', { 
                    // Expand member when clicked

                    cmp.el.addListener('click', function(cmp, el) {

                        var member = Ext.get(el).up('.member'),

                            docClass = member.down('.meta .docClass'),

                            docClass = member.down('.meta .defined-in'),

                            clsName = docClass.getAttribute('rel'),

                            memberName = member.getAttribute('id');

template/app/view/Comments.js

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ Ext.define('Docs.view.Comments', { 
        Ext.Array.each(Ext.query('.member'), function(memberDom) {

            var memberEl = Ext.get(memberDom),

                memberId = memberEl.getAttribute('id'),

                memberCls = memberEl.down('.meta .docClass').getAttribute('rel'),

                memberCls = memberEl.down('.meta .defined-in').getAttribute('rel'),

                commentsWrap = memberEl.down('.comments a.name'),

                memberTitle = memberEl.down('.title'),

                numComments = Docs.commentMeta['class'][memberCls] && Docs.commentMeta['class'][memberCls][memberId],

template/resources/sass/_class_overview.scss

+6 −6
Original line number Diff line number Diff line
@@ -115,21 +115,21 @@ 
    .meta {

      float: right;

      text-align: right; }

    a.definedIn, a.viewSource {

      font-family: "Helvetica", "Arial", sans-serif; }

    a.definedIn {

    .defined-in, .view-source {

      font-family: "Helvetica", "Arial", sans-serif;

      font-size: 0.9em; }

    a.defined-in {

      color: #888888;

      font-size: 0.9em;

      &:hover {

        color: $docs-link-hover-color; } }

    a.viewSource {

    a.view-source {

      color: rgba(0, 0, 0, 0);

      -webkit-transition: color 0.2s linear;

      font-size: 0.9em;

      &:hover {

        color: $docs-link-hover-color; } }

    &:hover {

      a.viewSource {

      a.view-source {

        color: rgba(128, 128, 128, 1);

        -webkit-transition: color 0.2s linear; } }

    &.open {