[Commits] [fluid-project/infusion] f6fe03: FLUID-5474: No longer removing tocTemplate option

GitHub noreply at github.com
Thu Jul 17 09:29:37 EDT 2014


  Branch: refs/heads/infusion-1.5.x
  Home:   https://github.com/fluid-project/infusion
  Commit: f6fe0385b37536806b46b7f479fed7aff78a29b5
      https://github.com/fluid-project/infusion/commit/f6fe0385b37536806b46b7f479fed7aff78a29b5
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M src/components/uiOptions/js/UIOptions.js
    M src/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  FLUID-5474: No longer removing tocTemplate option
Distribute options had been moving the tocTemplate option, as opposed to copying it. The result of which was that the iframeEnhancer was looking for the option in a place it had been removed from. Also added tests to verify that the tocTemplate is being passed to the iframeEnhancer.


  Commit: 41b9a821f61bd01187d00e7b8217cb27b46ad262
      https://github.com/fluid-project/infusion/commit/41b9a821f61bd01187d00e7b8217cb27b46ad262
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M src/components/uiOptions/js/UIOptions.js
    M src/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'justin/FLUID-5474-1.5.1' into infusion-1.5.x

* justin/FLUID-5474-1.5.1:
  FLUID-5474: No longer removing tocTemplate option Distribute options had been moving the tocTemplate option, as opposed to copying it. The result of which was that the iframeEnhancer was looking for the option in a place it had been removed from. Also added tests to verify that the tocTemplate is being passed to the iframeEnhancer.


Compare: https://github.com/fluid-project/infusion/compare/3779908f18af...41b9a821f61b


More information about the Commits mailing list