[Commits] [fluid-project/infusion] dd8b18: FLUID-5210: Added a merge policy

GitHub noreply at github.com
Wed Nov 13 10:46:10 EST 2013


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: dd8b181ff25aebd3c0c77f722539ab7ce7993628
      https://github.com/fluid-project/infusion/commit/dd8b181ff25aebd3c0c77f722539ab7ce7993628
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M src/framework/preferences/js/Panels.js
    M src/tests/framework-tests/preferences/html/Panels-test.html
    M src/tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5210: Added a merge policy

Adds a merge policy to the composite panel for merging selectorsToIgnore. This is necessary for the case where the composite panel has defined selectorsToIgnore. When the auxBuilder is run it needs to add selectorsToIgnore for the subpanel containers.


  Commit: f2b1a416d81c2be1afde8b348cb60bac5257314f
      https://github.com/fluid-project/infusion/commit/f2b1a416d81c2be1afde8b348cb60bac5257314f
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M src/framework/preferences/js/Panels.js
    M src/tests/framework-tests/preferences/html/Panels-test.html
    M src/tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  Merge branch 'FLUID-5210'

* FLUID-5210:
  FLUID-5210: Added a merge policy


Compare: https://github.com/fluid-project/infusion/compare/722535cdc902...f2b1a416d81c


More information about the Commits mailing list