Skip to content

Latest commit

 

History

History
816 lines (757 loc) · 25.6 KB

DIFF_HTML_TEMPLATES.md

File metadata and controls

816 lines (757 loc) · 25.6 KB

File modified

<section
  class="iterable-item bb-udiff maskable commentable-diff"
  data-path="filename.js"
  data-source-url="/api/internal/repositories/team/repo/src/a6a74247b1a9bc6d33661e28917459b36b50c5aa/filename.js"
  id="chg-filename.js"
  data-identifier="filename.js"
  data-filename="filename.js"
  data-linecommentroots="{}"
  data-fe-word-diff="true"
  data-compare-files-url="/!api/1.0/repositories/team/repo/comparefiles/team/repo:a6a74247b1a9..0b72308d569a"
  data-expand-context-url="/!api/1.0/repositories/team/repo/pullrequests/1/_context/"
  data-eclipsed-comment-view-url="/team/repo/pull-requests/1/setting-default-value-control-according-to/activity"
>
  <div class="diff-container">
    <div class="heading">
      <div class="primary">
        <h1 class="filename">
          <span class="aui-icon aui-icon-small aui-iconfont-devtools-file diff-entry-kind-icon">
            File
          </span>
          filename.js
          <span class="diff-entry-lozenge aui-lozenge aui-lozenge-subtle aui-lozenge-complete">
            Modified
          </span>
        </h1>
      </div>
      <div class="diff-actions secondary" id="side-by-side-49">
        <div class="aui-buttons">
          <button
            class="execute click aui-button aui-button-light sbs"
            data-module="components/tooltip"
            href="#side-by-side-49-content"
            original-title="View the side-by-side diff for this file"
            resolved=""
          >
            Side-by-side diff
          </button>

          <a
            class="view-file aui-button aui-button-light"
            href="/team/repo/src/a6a74247b1a9bc6d33661e28917459b36b50c5aa/filename.js"
            data-module="components/tooltip"
            original-title="View the full source of this file"
            resolved=""
          >
            View file
          </a>
        </div>

        <div class="aui-buttons">
          <button
            class="add-diff-comment add-file-comment aui-button aui-button-light"
            data-module="components/tooltip"
            original-title="Add a file comment"
            resolved=""
          >
            Comment
          </button>
        </div>

        <div class="aui-buttons">
          <button
            class="aui-button aui-button-light aui-button-subtle aui-dropdown2-trigger aui-dropdown2-trigger-arrowless aui-dropdown2-trigger-more"
            aria-haspopup="true"
            data-container="#chg-filename.js"
            resolved=""
            aria-controls="file-more-dropdown-filename.js"
            aria-expanded="false"
            href="#"
          >
            <span class="aui-icon aui-icon-small aui-iconfont-more">More</span>
          </button>
        </div>
        <div
          id="file-more-dropdown-filename.js"
          class="aui-dropdown2 aui-style-default aui-layer"
          resolved=""
          aria-hidden="true"
        >
          <ul>
            <li>
              <span
                role="checkbox"
                class="diff-ignore-whitespace aui-dropdown2-checkbox aui-dropdown2-checkbox-right"
                data-jump-to="#chg-filename.js"
                aria-checked="false"
                data-key="ignoreWhitespace"
                data-tooltip-gravity="e"
                data-module="components/tooltip"
                original-title="Ignore whitespace changes for all files in this diff"
                resolved=""
                tabindex="0"
              >
                Ignore whitespace
              </span>
            </li>

            <li>
              <a class="edit-button pjax-trigger" href="#">
                Edit file
              </a>
            </li>

            <li>
              <span
                role="checkbox"
                class="diff-hide-word-diff aui-dropdown2-checkbox aui-dropdown2-checkbox-right"
                data-diff="chg-filename.js"
                data-key="hideWordDiff"
                title="Hide word diff"
                resolved=""
                aria-checked="false"
                tabindex="0"
              >
                Hide word diff
              </span>
            </li>
          </ul>
        </div>
        <div class="bb-sbs-patch tab-size-None" id="side-by-side-49-content" />
      </div>
    </div>

    <div class="diff-content-container refract-container word-diff">
      <div class="refract-content-container">
        <div
          class="skipped-container"
          style="counter-reset: fromLines 434 toLines 434;"
        >
          <div class="line-numbers-skipped skipped-top first">
            <span class="ellipsis" title="Show more lines" />
          </div>
          <div class="skipped-top first" />
        </div>

        <div class="udiff-line common">
          <div class="gutter" id="Lfilename.jsF435T435">
            <a
              href="#add-comment"
              class="add-diff-comment add-line-comment"
              title="Add a comment to this line"
            >
              <span class="aui-icon aui-icon-small aui-iconfont-add-comment">
                Add a comment to this line
              </span>
            </a>

            <a
              class="line-numbers"
              data-fnum="435"
              data-tnum="435"
              href="#Lfilename.jsF435T435"
            />
          </div>

          <pre class="source">
            // This line is unchanged,
          </pre>
        </div>

        <div class="udiff-line deletion">
          <div class="gutter" id="Lfilename.jsF438">
            <a
              href="#add-comment"
              class="add-diff-comment add-line-comment"
              title="Add a comment to this line"
            >
              <span class="aui-icon aui-icon-small aui-iconfont-add-comment">
                Add a comment to this line
              </span>
            </a>

            <a class="line-numbers" data-fnum="438" href="#Lfilename.jsF438" />
          </div>

          <pre class="source">
            - // This is a deleted <del>line</del>.
          </pre>
        </div>

        <div class="udiff-line addition">
          <div class="gutter" id="Lfilename.jsT438">
            <a
              href="#add-comment"
              class="add-diff-comment add-line-comment"
              title="Add a comment to this line"
            >
              <span class="aui-icon aui-icon-small aui-iconfont-add-comment">
                Add a comment to this line
              </span>
            </a>

            <a class="line-numbers" data-tnum="438" href="#Lfilename.jsT438" />
          </div>

          <pre class="source">
            + // This is an added <ins>line</ins>.
          </pre>
        </div>

        <div class="skipped-container">
          <div class="line-numbers-skipped skipped-bottom last">
            <span class="ellipsis" title="Show more lines" />
          </div>
          <div class="skipped-bottom last" />
        </div>
      </div>
    </div>
  </div>
</section>

File added

<!-- Omitted -->
<div class="primary">
  <h1 class="filename">
    <span class="aui-icon aui-icon-small aui-iconfont-devtools-file diff-entry-kind-icon">
      File
    </span>
    filename.js
    <span class="diff-entry-lozenge aui-lozenge aui-lozenge-subtle aui-lozenge-success">
      Added
    </span>
  </h1>
</div>
<!-- Omitted -->

File deleted

<!-- Omitted -->
<div class="primary">
  <h1 class="filename">
    <span class="aui-icon aui-icon-small aui-iconfont-devtools-file diff-entry-kind-icon">
      File
    </span>
    filename.js
    <span class="diff-entry-lozenge aui-lozenge aui-lozenge-subtle aui-lozenge-error">
      Deleted
    </span>
  </h1>
</div>
<!-- Omitted -->

<!-- Also, deleted files don't have 'Side by Side' button -->

File renamed/moved

<!-- Omitted -->
<div class="primary">
  <h1 class="filename">
    <span class="aui-icon aui-icon-small aui-iconfont-devtools-file diff-entry-kind-icon">
      File
    </span>
    path/old_name.js → { new_name.js }
    <span class="diff-entry-similarity">(92% similar)</span>
    <span class="diff-entry-lozenge aui-lozenge aui-lozenge-subtle aui-lozenge-moved">
      Renamed
    </span>
  </h1>
</div>
<!-- Omitted -->

File with contents unchanged

<section
  class="iterable-item bb-udiff maskable commentable-diff"
  data-path="sample.html"
  data-source-url="/api/internal/repositories/reyronald/tutorial/src/a9749d4d73013d892b662c723244d5e4dab121b9/sample.html"
  id="chg-sample.html"
  data-identifier="sample.html"
  data-filename="sample.html"
  data-linecommentroots="{}"
  data-fe-word-diff="true"
  data-compare-files-url="/!api/1.0/repositories/reyronald/tutorial/comparefiles/reyronald/tutorial:a9749d4d7301..8d45d84c890b"
  data-expand-context-url="/!api/1.0/repositories/reyronald/tutorial/pullrequests/1/_context/"
  data-eclipsed-comment-view-url="/reyronald/tutorial/pull-requests/1/change-whitespace/activity"
  data-ignore-whitespace="true"
>
  <div class="diff-container">
    <div class="heading">
      <div class="primary">
        <h1 class="filename">
          <span class="aui-icon aui-icon-small aui-iconfont-devtools-file diff-entry-kind-icon">
            File
          </span>
          sample.html
          <span class="diff-entry-lozenge aui-lozenge aui-lozenge-subtle aui-lozenge-complete">
            Modified
          </span>
        </h1>
      </div>
      <div class="diff-actions secondary" id="side-by-side-46">
        <div class="aui-buttons">
          <a
            class="view-file aui-button aui-button-light"
            href="/reyronald/tutorial/src/a9749d4d73013d892b662c723244d5e4dab121b9/sample.html"
            data-module="components/tooltip"
            original-title="View the full source of this file"
            resolved=""
          >
            View file
          </a>
        </div>

        <div class="aui-buttons">
          <button
            class="add-diff-comment add-file-comment aui-button aui-button-light"
            data-module="components/tooltip"
            original-title="Add a file comment"
            resolved=""
          >
            Comment
          </button>
        </div>

        <div class="aui-buttons">
          <button
            class="aui-button aui-button-light aui-button-subtle aui-dropdown2-trigger aui-dropdown2-trigger-arrowless aui-dropdown2-trigger-more"
            aria-haspopup="true"
            data-container="#chg-sample.html"
            resolved=""
            aria-controls="file-more-dropdown-sample.html"
            aria-expanded="false"
            href="#"
          >
            <span class="aui-icon aui-icon-small aui-iconfont-more">More</span>
          </button>
        </div>
        <div
          id="file-more-dropdown-sample.html"
          class="aui-dropdown2 aui-style-default aui-layer"
          resolved=""
          aria-hidden="true"
        >
          <ul>
            <li>
              <span
                role="checkbox"
                class="diff-ignore-whitespace aui-dropdown2-checkbox aui-dropdown2-checkbox-right aui-dropdown2-checked checked"
                data-jump-to="#chg-sample.html"
                aria-checked="true"
                data-key="ignoreWhitespace"
                data-tooltip-gravity="e"
                data-module="components/tooltip"
                original-title="Ignore whitespace changes for all files in this diff"
                resolved=""
                tabindex="0"
              >
                Ignore whitespace
              </span>
            </li>

            <li>
              <a class="edit-button pjax-trigger" href="#">
                Edit file
              </a>
            </li>

            <li>
              <span
                role="checkbox"
                class="diff-hide-word-diff aui-dropdown2-checkbox aui-dropdown2-checkbox-right"
                data-diff="chg-sample.html"
                data-key="hideWordDiff"
                title="Hide word diff"
                resolved=""
                aria-checked="false"
                tabindex="0"
              >
                Hide word diff
              </span>
            </li>
          </ul>
        </div>
        <div class="bb-sbs-patch tab-size-None" id="side-by-side-46-content" />
      </div>
    </div>

    <div class="diff-content-container content-container ">
      <div class="diff-note">File contents unchanged.</div>
    </div>
  </div>
</section>

File renamed but contents unchanged.

<section
  class="iterable-item bb-udiff maskable commentable-diff"
  data-path="sample_renamed.html"
  data-source-url="/api/internal/repositories/reyronald/tutorial/src/3d4760b098acc7b0f60a891ec612fce183965f02/sample_renamed.html"
  id="chg-sample_renamed.html"
  data-identifier="sample_renamed.html"
  data-filename="sample_renamed.html"
  data-linecommentroots="{}"
  data-fe-word-diff="true"
  data-compare-files-url="/!api/1.0/repositories/reyronald/tutorial/changesets/3d4760b098acc7b0f60a891ec612fce183965f02/diff"
  data-expand-context-url="/!api/1.0/repositories/reyronald/tutorial/changesets/3d4760b098acc7b0f60a891ec612fce183965f02/_context/"
  data-rename-info="{&quot;srcpath&quot;: &quot;sample.html&quot;, &quot;pretty_format&quot;: &quot;sample.html \u2192 sample_renamed.html&quot;, &quot;similarity&quot;: 100}"
>
  <div class="diff-container">
    <div class="heading">
      <div class="primary">
        <h1 class="filename">
          <span class="aui-icon aui-icon-small aui-iconfont-devtools-file diff-entry-kind-icon">
            File
          </span>
          sample.html → sample_renamed.html
          <span class="diff-entry-lozenge aui-lozenge aui-lozenge-subtle aui-lozenge-moved">
            Renamed
          </span>
        </h1>
      </div>
      <div class="diff-actions secondary" id="side-by-side-22">
        <div class="aui-buttons">
          <a
            class="view-file aui-button aui-button-light"
            href="/reyronald/tutorial/src/3d4760b098acc7b0f60a891ec612fce183965f02/sample_renamed.html"
            data-module="components/tooltip"
            original-title="View the full source of this file"
            resolved=""
          >
            View file
          </a>
        </div>

        <div class="aui-buttons">
          <button
            class="add-diff-comment add-file-comment aui-button aui-button-light"
            data-module="components/tooltip"
            original-title="Add a file comment"
            resolved=""
          >
            Comment
          </button>
        </div>

        <div class="aui-buttons">
          <button
            class="aui-button aui-button-light aui-button-subtle aui-dropdown2-trigger aui-dropdown2-trigger-arrowless aui-dropdown2-trigger-more"
            aria-haspopup="true"
            data-container="#chg-sample_renamed.html"
            resolved=""
            aria-controls="file-more-dropdown-sample_renamed.html"
            aria-expanded="false"
            href="#"
          >
            <span class="aui-icon aui-icon-small aui-iconfont-more">More</span>
          </button>
        </div>
        <div
          id="file-more-dropdown-sample_renamed.html"
          class="aui-dropdown2 aui-style-default aui-layer"
          resolved=""
          aria-hidden="true"
        >
          <ul>
            <li>
              <span
                role="checkbox"
                class="diff-ignore-whitespace aui-dropdown2-checkbox aui-dropdown2-checkbox-right"
                data-jump-to="#chg-sample_renamed.html"
                aria-checked="false"
                data-key="ignoreWhitespace"
                data-tooltip-gravity="e"
                data-module="components/tooltip"
                original-title="Ignore whitespace changes for all files in this diff"
                resolved=""
                tabindex="0"
              >
                Ignore whitespace
              </span>
            </li>

            <li>
              <span
                role="checkbox"
                class="diff-hide-word-diff aui-dropdown2-checkbox aui-dropdown2-checkbox-right"
                data-diff="chg-sample_renamed.html"
                data-key="hideWordDiff"
                title="Hide word diff"
                resolved=""
                aria-checked="false"
                tabindex="0"
              >
                Hide word diff
              </span>
            </li>
          </ul>
        </div>
        <div class="bb-sbs-patch tab-size-None" id="side-by-side-22-content" />
      </div>
    </div>

    <div class="diff-content-container content-container ">
      <div class="diff-note">File renamed but contents unchanged.</div>
    </div>
  </div>
</section>

File with diff that failed to load (diff-too-big)

<section
  class="bb-udiff iterable-item"
  id="chg-src/app/webapp/package-lock.json"
  data-identifier="src/app/webapp/package-lock.json"
  data-filename="src/app/webapp/package-lock.json"
  data-eclipsed-comment-view-url=""
>
  <div class="heading ">
    <div class="primary">
      <h1 class="filename">src/app/webapp/package-lock.json</h1>
    </div>

    <div class="secondary diff-actions" />
  </div>
  <div class="diff-message-container">
    <div class="aui-message info too-big-message">
      <p class="title">
        <span class="aui-icon icon-info" />
        <strong class="try-again">
          Oops! You've got a lot of code in this diff and it couldn't load with
          the page.
        </strong>
        <a href="#" class="load-diff try-again">
          Click here to give it another chance.
        </a>
        <strong class="try-again-failed">
          Now that is a lot of code! There's simply too much in this diff for us
          to render it all.
        </strong>
      </p>
    </div>
  </div>
</section>

File with conflicts

<!-- Omitted -->
<div class="diff-container">
    <div class="heading conflicts">
    <div class="primary">
        <h1 class="filename">
        <span class="aui-icon aui-icon-small aui-iconfont-devtools-file diff-entry-kind-icon">
            File
        </span>
        packages/layer-manager/package.json
        <span class="diff-entry-lozenge aui-lozenge aui-lozenge-current">
            Conflict
        </span>
        </h1>
    </div>
    <div class="diff-actions secondary" id="side-by-side-94">
        <div class="aui-buttons">
        <button
            class="execute click aui-button aui-button-light sbs"
            data-module="components/tooltip"
            href="#side-by-side-94-content"
            original-title="View the side-by-side diff for this file"
            resolved=""
        >
            Side-by-side diff
        </button>

        <a
            class="view-file aui-button aui-button-light"
            href="/atlassian/atlaskit/src/00d62dcf168497f49617f119b5fa086fe6788567/packages/layer-manager/package.json"
            data-module="components/tooltip"
            original-title="View the full source of this file"
            resolved=""
        >
            View file
        </a>
        </div>

        <div class="aui-buttons">
        <button
            class="add-diff-comment add-file-comment aui-button aui-button-light"
            data-module="components/tooltip"
            original-title="Add a file comment"
            resolved=""
        >
            Comment
        </button>
        </div>

        <div class="aui-buttons">
        <button
            class="aui-button aui-button-light aui-button-subtle aui-dropdown2-trigger aui-dropdown2-trigger-arrowless aui-dropdown2-trigger-more"
            aria-haspopup="true"
            data-container="#chg-packages/layer-manager/package.json"
            resolved=""
            aria-controls="file-more-dropdown-packages/layer-manager/package.json"
            aria-expanded="false"
            href="#"
        >
            <span class="aui-icon aui-icon-small aui-iconfont-more">More</span>
        </button>
        </div>
        <div
        id="file-more-dropdown-packages/layer-manager/package.json"
        class="aui-dropdown2 aui-style-default aui-layer"
        resolved=""
        aria-hidden="true"
        >
        <ul>
            <li>
            <span
                role="checkbox"
                class="diff-ignore-whitespace aui-dropdown2-checkbox aui-dropdown2-checkbox-right"
                data-jump-to="#chg-packages/layer-manager/package.json"
                aria-checked="false"
                data-key="ignoreWhitespace"
                data-tooltip-gravity="e"
                data-module="components/tooltip"
                original-title="Ignore whitespace changes for all files in this diff"
                resolved=""
                tabindex="0"
            >
                Ignore whitespace
            </span>
            </li>

            <li>
            <span
                role="checkbox"
                class="diff-hide-word-diff aui-dropdown2-checkbox aui-dropdown2-checkbox-right"
                data-diff="chg-packages/layer-manager/package.json"
                data-key="hideWordDiff"
                title="Hide word diff"
                resolved=""
                aria-checked="false"
                tabindex="0"
            >
                Hide word diff
            </span>
            </li>
        </ul>
        </div>
        <div class="bb-sbs-patch tab-size-None" id="side-by-side-94-content" />
    </div>
    </div>

    <div class="diff-message-container">
        <div class="aui-message aui-message-warning warning">
            <p class="title">
            <strong>Conflict: Modified in source but deleted in destination</strong>
            </p>
            To be able to merge you will need to resolve the conflicts manually.
            <a target="_blank" href="https://confluence.atlassian.com/x/M4H8KQ">
            Learn how
            </a>.
        </div>
    </div>
</div>

<!-- Omitted -->

<div class="udiff-line addition conflict-marker conflict">
  <div class="gutter" id="LREADME.mdT189">
    <a
      href="#add-comment"
      class="add-diff-comment add-line-comment"
      title="Add a comment to this line"
    >
      <span class="aui-icon aui-icon-small aui-iconfont-add-comment">
        Add a comment to this line
      </span>
    </a>

    <a class="line-numbers" data-tnum="189" href="#LREADME.mdT189" />
  </div>

  <pre class="source">
    +<<<<<<< destination:36f22bd2b8fa2233960e7185d0c4a8a0cfb66cf9
  </pre>
</div>

File with comments on previous versions

<div class="heading">
  <div class="primary">
    <h1 class="filename">
      <span class="aui-icon aui-icon-small aui-iconfont-devtools-file diff-entry-kind-icon">
        File
      </span>
      filename.js
      <span class="diff-entry-lozenge aui-lozenge aui-lozenge-subtle aui-lozenge-success">
        Added
      </span>
    </h1>
  </div>
  <div class="diff-actions secondary" id="side-by-side-47">
    <button
      class="eclipsedcount aui-button aui-button-light aui-button-subtle"
      data-module="components/tooltip"
      original-title="3 comments on previous versions of this file"
      resolved=""
    >
      <span class="aui-badge">3</span>
    </button>

    <div class="aui-buttons">
      <button
        class="execute click aui-button aui-button-light sbs"
        data-module="components/tooltip"
        href="#side-by-side-47-content"
        original-title="View the side-by-side diff for this file"
        resolved=""
      >
        Side-by-side diff
      </button>

      <a
        class="view-file aui-button aui-button-light"
        href="/team/repo/src/d858cb757ab383db0d3e78f6e714ce877b8c2ff8/filename.js"
        data-module="components/tooltip"
        original-title="View the full source of this file"
        resolved=""
      >
        View file
      </a>
    </div>

    <div class="aui-buttons">
      <button
        class="add-diff-comment add-file-comment aui-button aui-button-light"
        data-module="components/tooltip"
        original-title="Add a file comment"
        resolved=""
      >
        Comment
      </button>
    </div>

    <div class="aui-buttons">
      <button
        class="aui-button aui-button-light aui-button-subtle aui-dropdown2-trigger aui-dropdown2-trigger-arrowless aui-dropdown2-trigger-more"
        aria-haspopup="true"
        data-container="#chg-filename.js"
        resolved=""
        aria-controls="file-more-dropdown-filename.js"
        aria-expanded="false"
        href="#"
      >
        <span class="aui-icon aui-icon-small aui-iconfont-more">More</span>
      </button>
    </div>
    <div
      id="file-more-dropdown-filename.js"
      class="aui-dropdown2 aui-style-default aui-layer"
      resolved=""
      aria-hidden="true"
    >
      <ul>
        <li>
          <span
            role="checkbox"
            class="diff-ignore-whitespace aui-dropdown2-checkbox aui-dropdown2-checkbox-right aui-dropdown2-checked checked"
            data-jump-to="#chg-filename.js"
            aria-checked="true"
            data-key="ignoreWhitespace"
            data-tooltip-gravity="e"
            data-module="components/tooltip"
            original-title="Ignore whitespace changes for all files in this diff"
            resolved=""
            tabindex="0"
          >
            Ignore whitespace
          </span>
        </li>

        <li>
          <a class="edit-button pjax-trigger" href="#">
            Edit file
          </a>
        </li>

        <li>
          <span
            role="checkbox"
            class="diff-hide-word-diff aui-dropdown2-checkbox aui-dropdown2-checkbox-right"
            data-diff="chg-filename.js"
            data-key="hideWordDiff"
            title="Hide word diff"
            resolved=""
            aria-checked="false"
            tabindex="0"
          >
            Hide word diff
          </span>
        </li>
      </ul>
    </div>
    <div class="bb-sbs-patch tab-size-None" id="side-by-side-47-content" />
  </div>
</div>