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

GitHub noreply at github.com
Thu Jul 17 09:22:00 EDT 2014


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: 3436498f08b62ae115bfaf2d6f973c62eab47729
      https://github.com/fluid-project/infusion/commit/3436498f08b62ae115bfaf2d6f973c62eab47729
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-07-16 (Wed, 16 Jul 2014)

  Changed paths:
    M src/components/uiOptions/js/UIOptions.js
    M 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: f3ae72f4a3ac3700693a0e3954af46c1ecdd5f15
      https://github.com/fluid-project/infusion/commit/f3ae72f4a3ac3700693a0e3954af46c1ecdd5f15
  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 tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'justin/FLUID-5474'

* justin/FLUID-5474:
  FLUID-5474: No longer removing tocTemplate option


Compare: https://github.com/fluid-project/infusion/compare/63d7180d3825...f3ae72f4a3ac


More information about the Commits mailing list