[Commits] [fluid-project/infusion] e5025c: Merge branch 'master' into FLUID-4352

noreply at github.com noreply at github.com
Wed Aug 3 16:19:22 UTC 2011


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion

  Commit: e5025c445933b8cb861272929a685928b19cd67d
      https://github.com/fluid-project/infusion/commit/e5025c445933b8cb861272929a685928b19cd67d
  Author: Harris Wong <harris.wong at gmail.com>
  Date:   2011-08-02 (Tue, 02 Aug 2011)

  Changed paths:
    M build-scripts/uiOptions/js/StylesheetImportant.js
  M src/webapp/components/tableOfContents/js/TableOfContents.js
  M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
  M src/webapp/framework/fss/css/fss-theme-blackYellow.css
  M src/webapp/framework/fss/css/fss-theme-hc.css
  M src/webapp/framework/fss/css/fss-theme-hci.css
  M src/webapp/framework/fss/css/fss-theme-yellowBlack.css
  M src/webapp/tests/component-tests/tableOfContents/js/TableOfContentsTests.js

  Log Message:
  -----------
  Merge branch 'master' into FLUID-4352


  Commit: 7fee206b1a10cc16624cc2edf0f85c79cadd7432
      https://github.com/fluid-project/infusion/commit/7fee206b1a10cc16624cc2edf0f85c79cadd7432
  Author: Harris Wong <harris.wong at gmail.com>
  Date:   2011-08-02 (Tue, 02 Aug 2011)

  Changed paths:
    M src/webapp/tests/component-tests/tableOfContents/html/TableOfContents-test.html
  M src/webapp/tests/component-tests/tableOfContents/js/TableOfContentsTests.js

  Log Message:
  -----------
  FLUID-4352: Added unit test for empty headings

Added unit tests as suggested by https://github.com/fluid-project/infusion/pull/122#issuecomment-1683235.  Used some of the existing test functions with different parameter to test empty headings.  Also added a new markup with no headings to test the rendering.  Added a check specifically in renderTOCTest() to ensure <ul> is not in the markup when headings are empty.


  Commit: e3385646246c2fd37858e57b67e756d9dc07dac4
      https://github.com/fluid-project/infusion/commit/e3385646246c2fd37858e57b67e756d9dc07dac4
  Author: Harris Wong <harris.wong at gmail.com>
  Date:   2011-08-02 (Tue, 02 Aug 2011)

  Changed paths:
    M src/webapp/tests/component-tests/tableOfContents/js/TableOfContentsTests.js

  Log Message:
  -----------
  FLUID-4352: Typo in comment, 4252 should be 4352

Made a typo in the comments, 4252 should be 4352.


  Commit: c8a4ac29f481556dddcb65267dc4a4c982c230da
      https://github.com/fluid-project/infusion/commit/c8a4ac29f481556dddcb65267dc4a4c982c230da
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2011-08-03 (Wed, 03 Aug 2011)

  Changed paths:
    M src/webapp/components/tableOfContents/js/TableOfContents.js
  M src/webapp/tests/component-tests/tableOfContents/html/TableOfContents-test.html
  M src/webapp/tests/component-tests/tableOfContents/js/TableOfContentsTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'harriswong/FLUID-4352'

* harriswong/FLUID-4352:
  FLUID-4352: Typo in comment, 4252 should be 4352
  FLUID-4352: Added unit test for empty headings
  FLUID-4352: generateTree now handles empty case


Compare: https://github.com/fluid-project/infusion/compare/b382be1...c8a4ac2


More information about the Commits mailing list