[Commits] [fluid-project/infusion] f9ae9a: Merge pull request #1 from fluid-project/master

Tue Jul 5 14:08:54 UTC 2016

  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: f9ae9af8ff7b2d0a6054de6ba01195cba0dab43f
      https://github.com/fluid-project/infusion/commit/f9ae9af8ff7b2d0a6054de6ba01195cba0dab43f
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-04-19 (Tue, 19 Apr 2016)

  Changed paths:
    M .gitignore
    M Gruntfile.js
    M README.md
    A Vagrantfile
    M demos/reorderer/imageReorderer/index.html
    M package.json
    A provisioning/playbook.yml
    A provisioning/requirements.yml
    A provisioning/vars.yml
    M src/components/pager/js/PagedTable.js
    M src/components/pager/js/Pager.js
    M src/components/pager/js/Table.js
    M src/components/progress/js/Progress.js
    M src/components/reorderer/js/Reorderer.js
    M src/components/slidingPanel/js/SlidingPanel.js
    M src/components/tableOfContents/js/TableOfContents.js
    M src/components/tooltip/js/Tooltip.js
    M src/components/uploader/js/FileQueueView.js
    M src/components/uploader/js/UploaderCompatibility-Infusion1.2.js
    M src/framework/core/js/DataBinding.js
    M src/framework/core/js/Fluid.js
    M src/framework/core/js/FluidIoC.js
    M src/framework/core/js/FluidView.js
    M src/framework/core/js/ModelTransformation.js
    M src/framework/core/js/ModelTransformationTransforms.js
    M src/framework/enhancement/js/ContextAwareness.js
    M src/framework/preferences/css/stylus/SeparatedPanelPrefsEditor.styl
    M src/framework/preferences/css/stylus/utils/Themes.styl
    M src/framework/preferences/html/PrefsEditorTemplate-lineSpace.html
    M src/framework/preferences/html/PrefsEditorTemplate-textSize.html
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/framework/preferences/messages/prefsEditor.json
    M src/framework/renderer/js/RendererUtilities.js
    M tests/all-tests.html
    M tests/component-tests/progress/js/ProgressTests.js
    M tests/component-tests/reorderer/js/LayoutReordererTests.js
    M tests/component-tests/slidingPanel/html/SlidingPanel-test.html
    M tests/component-tests/slidingPanel/js/SlidingPanelTests.js
    M tests/component-tests/tooltip/html/Tooltip-test.html
    A tests/component-tests/tooltip/html/iframe.html
    M tests/component-tests/tooltip/js/TooltipTests.js
    M tests/component-tests/uploader/js/FileQueueViewTests.js
    M tests/framework-tests/core/js/CachingTests.js
    M tests/framework-tests/core/js/DataBindingTests.js
    M tests/framework-tests/core/js/FluidIoCTests.js
    M tests/framework-tests/core/js/FluidJSTests.js
    M tests/framework-tests/core/js/FluidPromisesTests.js
    M tests/framework-tests/core/js/FluidViewTests.js
    M tests/framework-tests/core/js/ModelTransformationTests.js
    M tests/framework-tests/preferences/html/SelfVoicingEnactor-test.html
    M tests/framework-tests/preferences/js/BuilderTests.js
    M tests/framework-tests/preferences/js/EnactorsTests.js
    M tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    M tests/framework-tests/preferences/js/PanelsTests.js
    M tests/framework-tests/preferences/js/PrefsEditorTests.js
    M tests/framework-tests/preferences/js/SelfVoicingEnactorTests.js
    M tests/framework-tests/preferences/js/SelfVoicingPanelTests.js
    M tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    M tests/framework-tests/renderer/js/RendererUtilitiesTests.js
    M tests/test-core/utils/js/IoCTestUtils.js
    A tests/testem.json

  Log Message:
  -----------
  Merge pull request #1 from fluid-project/master

merge upstream master

  Commit: d3b8935621fe4b92fac5b3f1c34cfc9bb9efc690
      https://github.com/fluid-project/infusion/commit/d3b8935621fe4b92fac5b3f1c34cfc9bb9efc690
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-04-19 (Tue, 19 Apr 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js

  Log Message:
  -----------
  FLUID-5892: save initial work to use native range input slider rather than jquery plugin (using both sliders)

  Commit: cee020a03363797d84ec2747ae43c91761dead91
      https://github.com/fluid-project/infusion/commit/cee020a03363797d84ec2747ae43c91761dead91
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-04-20 (Wed, 20 Apr 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js

  Log Message:
  -----------
  FLUID-5892: refactoring to remove jQuery UI sliders completely; one test still not passing, investigating

  Commit: 9698341e952e4041d032c5698f5c12902801c89e
      https://github.com/fluid-project/infusion/commit/9698341e952e4041d032c5698f5c12902801c89e
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-04-20 (Wed, 20 Apr 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js

  Log Message:
  -----------
  FLUID-5892: all tests passing now, need to refactor implementation

  Commit: 31ab72a0e4de094833340a645c162b0b45ee0afa
      https://github.com/fluid-project/infusion/commit/31ab72a0e4de094833340a645c162b0b45ee0afa
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-04-21 (Thu, 21 Apr 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js

  Log Message:
  -----------
  FLUID-5892: use component configuration for setting slider value from model

  Commit: 2b8810a7c86d87f97bfbe8a06a844d2f2c07085b
      https://github.com/fluid-project/infusion/commit/2b8810a7c86d87f97bfbe8a06a844d2f2c07085b
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-04-21 (Thu, 21 Apr 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M src/framework/preferences/css/stylus/PrefsEditor.styl
    M tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js

  Log Message:
  -----------
  FLUID-5892: update CSS

  Commit: 81517bc28e5fc23bb1a3e4036d28331bd26693c4
      https://github.com/fluid-project/infusion/commit/81517bc28e5fc23bb1a3e4036d28331bd26693c4
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-04-21 (Thu, 21 Apr 2016)

  Changed paths:
    M src/framework/preferences/css/stylus/PrefsEditor.styl

  Log Message:
  -----------
  FLUID-5892: add a basic CSS to inherit height and width from parent for slider

  Commit: 3d7c72f46a5e391ad1ed527c9ba2af6b8476d532
      https://github.com/fluid-project/infusion/commit/3d7c72f46a5e391ad1ed527c9ba2af6b8476d532
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-04-21 (Thu, 21 Apr 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js

  Log Message:
  -----------
  FLUID-5892: that-ise tests

  Commit: c5d3588f3c65d6f22334806f461a4614e3b173f4
      https://github.com/fluid-project/infusion/commit/c5d3588f3c65d6f22334806f461a4614e3b173f4
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-04-21 (Thu, 21 Apr 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js

  Log Message:
  -----------
  FLUID-5892: use IoC for model updating

  Commit: 04f13f52eaad1d9c80dd40ab9c4b95be0aa36130
      https://github.com/fluid-project/infusion/commit/04f13f52eaad1d9c80dd40ab9c4b95be0aa36130
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-04-21 (Thu, 21 Apr 2016)

  Changed paths:
    M tests/component-tests/textfieldSlider/html/TextfieldSlider-test.html

  Log Message:
  -----------
  FLUID-5892: remove unneeded test markup

  Commit: c9b63bc3fd5b36632964d7a7d5832f396668fc7a
      https://github.com/fluid-project/infusion/commit/c9b63bc3fd5b36632964d7a7d5832f396668fc7a
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-04-22 (Fri, 22 Apr 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M src/framework/preferences/html/PrefsEditorTemplate-lineSpace.html
    M src/framework/preferences/html/PrefsEditorTemplate-textSize.html
    M tests/component-tests/textfieldSlider/html/TextfieldSlider-test.html
    M tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js

  Log Message:
  -----------
  FLUID-5892: further IoC refactoring; refactor HTML templates to use <input> for slider

  Commit: 7df461d94235a21a2faaa7e61d7d8a9c4cedc1c1
      https://github.com/fluid-project/infusion/commit/7df461d94235a21a2faaa7e61d7d8a9c4cedc1c1
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-04-22 (Fri, 22 Apr 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js

  Log Message:
  -----------
  FLUID-5892: ensure slider value is always numeric

  Commit: 6e1b9c0aeff1606b3a081049c59b9022d6291266
      https://github.com/fluid-project/infusion/commit/6e1b9c0aeff1606b3a081049c59b9022d6291266
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-04-22 (Fri, 22 Apr 2016)

  Changed paths:
    M tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5892: fix panel tests for new HTML5 slider implementation

  Commit: 6052ce0088ae9ec0b050d5256fec92cf199ebe36
      https://github.com/fluid-project/infusion/commit/6052ce0088ae9ec0b050d5256fec92cf199ebe36
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-04-22 (Fri, 22 Apr 2016)

  Changed paths:
    M tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    M tests/framework-tests/preferences/js/PrefsEditorTests.js

  Log Message:
  -----------
  FLUID-5892: update tests for new HTML5 slider implementation

  Commit: 402359f9f5da5ab7121224983167b105e9d9119d
      https://github.com/fluid-project/infusion/commit/402359f9f5da5ab7121224983167b105e9d9119d
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-04-22 (Fri, 22 Apr 2016)

  Changed paths:
    M src/framework/preferences/css/stylus/PrefsEditor.styl

  Log Message:
  -----------
  FLUID-5892: remove fl-slider-rangeInput styles (not used)

  Commit: 926148ee7e6b716b52134b78029e6008143e0933
      https://github.com/fluid-project/infusion/commit/926148ee7e6b716b52134b78029e6008143e0933
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-04-22 (Fri, 22 Apr 2016)

  Changed paths:
    M src/framework/preferences/css/stylus/PrefsEditor.styl

  Log Message:
  -----------
  FLUID-5892: whitespace

  Commit: 82c4f72d5e72fd77db4061608b22bb5be4b437f8
      https://github.com/fluid-project/infusion/commit/82c4f72d5e72fd77db4061608b22bb5be4b437f8
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-04-22 (Fri, 22 Apr 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js

  Log Message:
  -----------
  FLUID-5892: remove unused selector

  Commit: c2b514d71c9aad01db5efbc98048e5a50c638e27
      https://github.com/fluid-project/infusion/commit/c2b514d71c9aad01db5efbc98048e5a50c638e27
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-04-22 (Fri, 22 Apr 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M tests/component-tests/textfieldSlider/html/TextfieldSlider-test.html
    M tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js

  Log Message:
  -----------
  FLUID-5892: first pass at retaining jQuery-based slider as well as adding native one

  Commit: 6528cedd4e37219cbd472c52f016f487f768030c
      https://github.com/fluid-project/infusion/commit/6528cedd4e37219cbd472c52f016f487f768030c
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-04-28 (Thu, 28 Apr 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js

  Log Message:
  -----------
  FLUID-5892: extract a base slider grade

  Commit: 84e8210944f21d0de273dbd10853f328540db2c8
      https://github.com/fluid-project/infusion/commit/84e8210944f21d0de273dbd10853f328540db2c8
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-04-28 (Thu, 28 Apr 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js

  Log Message:
  -----------
  FLUID-5892: use stringValue for raw value from widget, value for stringToNumber transform

  Commit: 9e33b113c7649071e7e5bdf62ec5c16a851f1401
      https://github.com/fluid-project/infusion/commit/9e33b113c7649071e7e5bdf62ec5c16a851f1401
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-03 (Tue, 03 May 2016)

  Changed paths:
    A src/framework/preferences/html/PrefsEditorTemplate-lineSpace-native.html
    R src/framework/preferences/html/PrefsEditorTemplate-lineSpace.html
    A src/framework/preferences/html/PrefsEditorTemplate-textSize-native.html
    R src/framework/preferences/html/PrefsEditorTemplate-textSize.html
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/js/StarterSchemas.js
    M tests/framework-tests/preferences/js/AuxBuilderTests.js
    M tests/framework-tests/preferences/js/BuilderTests.js
    M tests/framework-tests/preferences/js/PanelsTests.js
    M tests/framework-tests/preferences/js/PrefsEditorTests.js

  Log Message:
  -----------
  FLUID-5892: rename lineSpace/textSize templates to include 'native' suffix

  Commit: 79097e85cbbb51ac5e7b6cac3478a065ff1404bb
      https://github.com/fluid-project/infusion/commit/79097e85cbbb51ac5e7b6cac3478a065ff1404bb
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-03 (Tue, 03 May 2016)

  Changed paths:
    A src/framework/preferences/html/PrefsEditorTemplate-lineSpace-jQuery.html
    A src/framework/preferences/html/PrefsEditorTemplate-textSize-jQuery.html

  Log Message:
  -----------
  FLUID-5892: add jQuery versions of the linespace/textsize templates

  Commit: 7d46a9b0ead41e221d25bf025cf073f1cdedcdeb
      https://github.com/fluid-project/infusion/commit/7d46a9b0ead41e221d25bf025cf073f1cdedcdeb
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js

  Log Message:
  -----------
  FLUID-5892: use makeGradeLinkage to manage slider widget defaults

  Commit: 43079dcfcfc015eee7b64dc500098e726629cd90
      https://github.com/fluid-project/infusion/commit/43079dcfcfc015eee7b64dc500098e726629cd90
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M src/framework/preferences/js/StarterSchemas.js

  Log Message:
  -----------
  FLUID-5892: make textSize and lineSpace panels configurable for native or jQuery slider

  Commit: c19276ad30440316a3a6f292bec89979f06fc443
      https://github.com/fluid-project/infusion/commit/c19276ad30440316a3a6f292bec89979f06fc443
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M src/framework/preferences/js/StarterSchemas.js
    M tests/component-tests/textfieldSlider/html/TextfieldSlider-test.html
    M tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js
    M tests/framework-tests/preferences/html/Panels-test.html
    M tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5892: initial implementation of context-aware textSize/lineSpace panels that respond to native/jQuery slider config

  Commit: 3b3d01c2690223e1563fe0b8a63b6854dbd4932b
      https://github.com/fluid-project/infusion/commit/3b3d01c2690223e1563fe0b8a63b6854dbd4932b
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js

  Log Message:
  -----------
  FLUID-5892: better comments about switching between native and jQuery slider

  Commit: 3a2766f7bf749b37dc9df22f40c7a764f0c96def
      https://github.com/fluid-project/infusion/commit/3a2766f7bf749b37dc9df22f40c7a764f0c96def
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    A src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-jQuery.html
    A src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-native.html
    R src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    M tests/framework-tests/preferences/js/URLUtilitiesTests.js
    M tests/manual-tests/framework/preferences/assortedContent/js/assortedContent.js

  Log Message:
  -----------
  FLUID-5892: separate SeparatedPanelPrefsEditorFrame into jQuery & native versions

  Commit: 2c009b5f8c85bd61532ec8747fc96ac9026dcc76
      https://github.com/fluid-project/infusion/commit/2c009b5f8c85bd61532ec8747fc96ac9026dcc76
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js

  Log Message:
  -----------
  FLUID-5892: make SeparatedPanelPrefsEditor context-aware for loading native or jquery template

  Commit: 674aee0d526e871cc256fc97180a2120859f4608
      https://github.com/fluid-project/infusion/commit/674aee0d526e871cc256fc97180a2120859f4608
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-13 (Fri, 13 May 2016)

  Changed paths:
    M src/framework/preferences/js/StarterGrades.js

  Log Message:
  -----------
  FLUID-5892: context-aware starterGrades

  Commit: 2c8470b304e6b626ac366599cfbc2919dec0fd61
      https://github.com/fluid-project/infusion/commit/2c8470b304e6b626ac366599cfbc2919dec0fd61
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M src/framework/preferences/js/StarterGrades.js

  Log Message:
  -----------
  FLUID-5892: make starterGrades context-aware for native vs. jquery

  Commit: cfb8c59050ef3980510feedeb35228da939076ae
      https://github.com/fluid-project/infusion/commit/cfb8c59050ef3980510feedeb35228da939076ae
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js
    M tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5892: use context awareness in textFieldSlider itself, rather than grade linkage (only set preference for native or jQuery in one place)

  Commit: 5986fb618a0b413d700b9f0ccad926847dbba3a5
      https://github.com/fluid-project/infusion/commit/5986fb618a0b413d700b9f0ccad926847dbba3a5
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M src/framework/preferences/js/StarterGrades.js
    M tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js
    M tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5892: merge remote changes

  Commit: f3025dd5a7934446ec530e90bb6a93e8c4c12f5a
      https://github.com/fluid-project/infusion/commit/f3025dd5a7934446ec530e90bb6a93e8c4c12f5a
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/js/StarterSchemas.js
    M tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js
    M tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5892: rename 'jQuery' to 'jQueryUI' to be more precise about context-awareness check

  Commit: d67eb359b84aad8c219e1902cf9984e6267008b3
      https://github.com/fluid-project/infusion/commit/d67eb359b84aad8c219e1902cf9984e6267008b3
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M tests/manual-tests/framework/preferences/assortedContent/js/assortedContent.js

  Log Message:
  -----------
  FLUID-5892: make manual test context-aware

  Commit: 8eeb838022b52d527b976777940b7d245e957f63
      https://github.com/fluid-project/infusion/commit/8eeb838022b52d527b976777940b7d245e957f63
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js
    R src/framework/preferences/html/PrefsEditorTemplate-lineSpace-jQuery.html
    A src/framework/preferences/html/PrefsEditorTemplate-lineSpace-jQueryUI.html
    R src/framework/preferences/html/PrefsEditorTemplate-lineSpace-native.html
    A src/framework/preferences/html/PrefsEditorTemplate-lineSpace-nativeHTML.html
    R src/framework/preferences/html/PrefsEditorTemplate-textSize-jQuery.html
    A src/framework/preferences/html/PrefsEditorTemplate-textSize-jQueryUI.html
    R src/framework/preferences/html/PrefsEditorTemplate-textSize-native.html
    A src/framework/preferences/html/PrefsEditorTemplate-textSize-nativeHTML.html
    R src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-jQuery.html
    A src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-jQueryUI.html
    R src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-native.html
    A src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/js/StarterSchemas.js
    M tests/framework-tests/preferences/js/AuxBuilderTests.js
    M tests/framework-tests/preferences/js/BuilderTests.js
    M tests/framework-tests/preferences/js/PanelsTests.js
    M tests/framework-tests/preferences/js/PrefsEditorTests.js
    M tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    M tests/framework-tests/preferences/js/URLUtilitiesTests.js
    M tests/manual-tests/framework/preferences/assortedContent/js/assortedContent.js

  Log Message:
  -----------
  FLUID-5892: rename native/jQuery HTML templates to nativeHTML/jQueryUI (more precise)

  Commit: 3db2abc09e2bb9b8f3d2a89d793fcad922204fff
      https://github.com/fluid-project/infusion/commit/3db2abc09e2bb9b8f3d2a89d793fcad922204fff
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js

  Log Message:
  -----------
  FLUID-5892: fix merge conflics

  Commit: fb4e722cc289f9b0742426ec130e86379696e9f8
      https://github.com/fluid-project/infusion/commit/fb4e722cc289f9b0742426ec130e86379696e9f8
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M src/framework/preferences/js/StarterSchemas.js

  Log Message:
  -----------
  FLUID-5892: be consistent about pattern for namespacing nativeHTML vs. jQueryUI

  Commit: bcc0c6d0382959f9b32b7349c9f403cd93162419
      https://github.com/fluid-project/infusion/commit/bcc0c6d0382959f9b32b7349c9f403cd93162419
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js

  Log Message:
  -----------
  FLUID-5892: be consistent about pattern for namespacing nativeHTML vs. jQueryUI

  Commit: 8ddd70fc43d6c680c2a4199dd52fb8c49488a83e
      https://github.com/fluid-project/infusion/commit/8ddd70fc43d6c680c2a4199dd52fb8c49488a83e
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    A tests/manual-tests/framework/preferences/assortedContent/index-jQueryUI.html
    M tests/manual-tests/framework/preferences/assortedContent/index.html

  Log Message:
  -----------
  FLUID-5892: make a jqueryUI widgets version of the manual preferences test

  Commit: 23f966588c31e7cd934898207f9bb6ba96510949
      https://github.com/fluid-project/infusion/commit/23f966588c31e7cd934898207f9bb6ba96510949
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    A tests/manual-tests/framework/preferences/fullPage/index-jQueryUI.html
    M tests/manual-tests/framework/preferences/fullPage/index.html

  Log Message:
  -----------
  FLUID-5892: make a jqueryUI widgets version of the manual preferences test

  Commit: 01b645823984bf061190b2e7b8e6ad99e57d4fe2
      https://github.com/fluid-project/infusion/commit/01b645823984bf061190b2e7b8e6ad99e57d4fe2
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    A tests/manual-tests/framework/preferences/fullPage-schema/index-jQueryUI.html
    M tests/manual-tests/framework/preferences/fullPage-schema/index.html

  Log Message:
  -----------
  FLUID-5892: make a jqueryUI widgets version of the manual preferences test

  Commit: 39c105105a6f46412f8c0b53546db8be315ad923
      https://github.com/fluid-project/infusion/commit/39c105105a6f46412f8c0b53546db8be315ad923
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M src/components/textfieldSlider/textfieldSliderDependencies.json

  Log Message:
  -----------
  FLUID-5892: add enhancement (for ContextAwareness) to dependencies

  Commit: 242991bd28ca3aaefdeddebfd6bfb52d85234d28
      https://github.com/fluid-project/infusion/commit/242991bd28ca3aaefdeddebfd6bfb52d85234d28
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js

  Log Message:
  -----------
  FLUID-5892: factor combinedSliderOptions into jQueryUI slider only

  Commit: fe8f0aea27c292790aad30d396be4fab9065df91
      https://github.com/fluid-project/infusion/commit/fe8f0aea27c292790aad30d396be4fab9065df91
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js

  Log Message:
  -----------
  FLUID-5892: more specific invoker/listener (setSliderAria -> setSliderAriaValueNow)

  Commit: e6952a0a8b41b8012bd634d8144d0f2619d47f42
      https://github.com/fluid-project/infusion/commit/e6952a0a8b41b8012bd634d8144d0f2619d47f42
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js

  Log Message:
  -----------
  FLUID-5892: destroy all implementation switches

  Commit: fe334d3debc1b5af8cf5dc0eb9cd87725c666789
      https://github.com/fluid-project/infusion/commit/fe334d3debc1b5af8cf5dc0eb9cd87725c666789
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js

  Log Message:
  -----------
  FLUID-5892: parameterize tests

  Commit: 9d6e47dd999254eebabfa67103bd99f28fd150f2
      https://github.com/fluid-project/infusion/commit/9d6e47dd999254eebabfa67103bd99f28fd150f2
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5892: in midst of test refactoring

  Commit: cd0ed1f9fc54be9a0b75a7ae6f000be2fe6a3773
      https://github.com/fluid-project/infusion/commit/cd0ed1f9fc54be9a0b75a7ae6f000be2fe6a3773
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5892: continue refactor

  Commit: 34c2d220e8342b51f719b90a1300c6deb65f1dbf
      https://github.com/fluid-project/infusion/commit/34c2d220e8342b51f719b90a1300c6deb65f1dbf
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5892: refactor textSize tests to reduce duplicated code

  Commit: b63dfa19bb6c67c534c115b5cab61055fe091493
      https://github.com/fluid-project/infusion/commit/b63dfa19bb6c67c534c115b5cab61055fe091493
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5892: use consistent namespace approach in textSize tests

  Commit: 2f82cd40c3dea59e98afde490060dc5707dd2fc2
      https://github.com/fluid-project/infusion/commit/2f82cd40c3dea59e98afde490060dc5707dd2fc2
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5892: refactor lineSpace tests to reduce duplicated code

  Commit: 6260389d210b7041c0fcc4856ace5b56d945ac2c
      https://github.com/fluid-project/infusion/commit/6260389d210b7041c0fcc4856ace5b56d945ac2c
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/js/StarterSchemas.js
    M tests/manual-tests/framework/preferences/assortedContent/js/assortedContent.js

  Log Message:
  -----------
  FLUID-5892: use defaultGradeNames for nativeHTML usage rather than an explicit makeCheck

  Commit: a404c0cceabaa017f1538b1ee765b9fa5c941683
      https://github.com/fluid-project/infusion/commit/a404c0cceabaa017f1538b1ee765b9fa5c941683
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M tests/manual-tests/framework/preferences/assortedContent/index-jQueryUI.html
    A tests/manual-tests/framework/preferences/assortedContent/index-nativeHTML.html
    R tests/manual-tests/framework/preferences/assortedContent/index.html
    M tests/manual-tests/framework/preferences/fullPage-schema/index-jQueryUI.html
    A tests/manual-tests/framework/preferences/fullPage-schema/index-nativeHTML.html
    R tests/manual-tests/framework/preferences/fullPage-schema/index.html
    M tests/manual-tests/framework/preferences/fullPage/index-jQueryUI.html
    A tests/manual-tests/framework/preferences/fullPage/index-nativeHTML.html
    R tests/manual-tests/framework/preferences/fullPage/index.html

  Log Message:
  -----------
  FLUID-5892: rename index.html to index-native.HTML so it's harder to miss that there are two manual tests

  Commit: e6306172b63cb7bf2a6c3f39c259197349bdf8ce
      https://github.com/fluid-project/infusion/commit/e6306172b63cb7bf2a6c3f39c259197349bdf8ce
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js

  Log Message:
  -----------
  FLUID-5892: use contextAwareness to decide whether iframe should have own jQuery, or is expected to use parent document one (destroy all implementation switches: the revenge)

  Commit: bc70d21602a42be7300aa4186ef351a585b5782b
      https://github.com/fluid-project/infusion/commit/bc70d21602a42be7300aa4186ef351a585b5782b
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    A demos/prefsFramework-jQueryUI/css/main.css
    A demos/prefsFramework-jQueryUI/html/SeparatedPanelPrefsEditor.html
    A demos/prefsFramework-jQueryUI/html/SeparatedPanelPrefsEditorWithTTS.html
    A demos/prefsFramework-jQueryUI/html/SimplifyPanelTemplate.html
    A demos/prefsFramework-jQueryUI/images/article_climate_change_1.gif
    A demos/prefsFramework-jQueryUI/images/article_climate_change_2.gif
    A demos/prefsFramework-jQueryUI/images/article_climate_change_3.gif
    A demos/prefsFramework-jQueryUI/images/bg.gif
    A demos/prefsFramework-jQueryUI/images/climate_change_collection_img.jpg
    A demos/prefsFramework-jQueryUI/images/feature_stories_bullet.png
    A demos/prefsFramework-jQueryUI/images/head_commerce.png
    A demos/prefsFramework-jQueryUI/images/head_title.gif
    A demos/prefsFramework-jQueryUI/images/head_title_black.png
    A demos/prefsFramework-jQueryUI/images/head_title_white.png
    A demos/prefsFramework-jQueryUI/images/head_title_yellow.png
    A demos/prefsFramework-jQueryUI/images/mid_nav_bullet-black.gif
    A demos/prefsFramework-jQueryUI/images/mid_nav_bullet-white.gif
    A demos/prefsFramework-jQueryUI/images/mid_nav_bullet-yellow.gif
    A demos/prefsFramework-jQueryUI/images/mid_nav_bullet.png
    A demos/prefsFramework-jQueryUI/images/nav_bar.png
    A demos/prefsFramework-jQueryUI/images/tab_left_side.png
    A demos/prefsFramework-jQueryUI/images/tab_middle_side.png
    A demos/prefsFramework-jQueryUI/images/tab_right_side.png
    A demos/prefsFramework-jQueryUI/images/theme_climate_90.gif
    A demos/prefsFramework-jQueryUI/index.html
    A demos/prefsFramework-jQueryUI/js/changeClass.js
    A demos/prefsFramework-jQueryUI/js/prefsEditorDemo.js
    A demos/prefsFramework-jQueryUI/json/config.json
    A demos/prefsFramework-jQueryUI/lib/buzz/README.md
    A demos/prefsFramework-jQueryUI/lib/buzz/js/buzz.js
    A demos/prefsFramework-jQueryUI/lib/html5shiv/js/html5shiv.js
    A demos/prefsFramework-jQueryUI/lib/html5shiv/readme.md
    A demos/prefsFramework-jQueryUI/messages/simplify.json
    A demos/prefsFramework-jQueryUI/templates/FatPanelUIOptions.html
    A demos/prefsFramework-jQueryUI/templates/UIOptionsTemplate-selfVoicing.html
    A demos/prefsFramework-jQueryUI/templates/UIOptionsTemplate-simplifiedContent.html

  Log Message:
  -----------
  FLUID-5892: jquery UI version of the demo

  Commit: 3f89f7a542296adb7e8cd50e974a655cc4becffb
      https://github.com/fluid-project/infusion/commit/3f89f7a542296adb7e8cd50e974a655cc4becffb
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    R demos/prefsFramework-jQueryUI/css/main.css
    R demos/prefsFramework-jQueryUI/html/SeparatedPanelPrefsEditor.html
    R demos/prefsFramework-jQueryUI/html/SeparatedPanelPrefsEditorWithTTS.html
    R demos/prefsFramework-jQueryUI/html/SimplifyPanelTemplate.html
    R demos/prefsFramework-jQueryUI/images/article_climate_change_1.gif
    R demos/prefsFramework-jQueryUI/images/article_climate_change_2.gif
    R demos/prefsFramework-jQueryUI/images/article_climate_change_3.gif
    R demos/prefsFramework-jQueryUI/images/bg.gif
    R demos/prefsFramework-jQueryUI/images/climate_change_collection_img.jpg
    R demos/prefsFramework-jQueryUI/images/feature_stories_bullet.png
    R demos/prefsFramework-jQueryUI/images/head_commerce.png
    R demos/prefsFramework-jQueryUI/images/head_title.gif
    R demos/prefsFramework-jQueryUI/images/head_title_black.png
    R demos/prefsFramework-jQueryUI/images/head_title_white.png
    R demos/prefsFramework-jQueryUI/images/head_title_yellow.png
    R demos/prefsFramework-jQueryUI/images/mid_nav_bullet-black.gif
    R demos/prefsFramework-jQueryUI/images/mid_nav_bullet-white.gif
    R demos/prefsFramework-jQueryUI/images/mid_nav_bullet-yellow.gif
    R demos/prefsFramework-jQueryUI/images/mid_nav_bullet.png
    R demos/prefsFramework-jQueryUI/images/nav_bar.png
    R demos/prefsFramework-jQueryUI/images/tab_left_side.png
    R demos/prefsFramework-jQueryUI/images/tab_middle_side.png
    R demos/prefsFramework-jQueryUI/images/tab_right_side.png
    R demos/prefsFramework-jQueryUI/images/theme_climate_90.gif
    R demos/prefsFramework-jQueryUI/index.html
    R demos/prefsFramework-jQueryUI/js/changeClass.js
    R demos/prefsFramework-jQueryUI/js/prefsEditorDemo.js
    R demos/prefsFramework-jQueryUI/json/config.json
    R demos/prefsFramework-jQueryUI/lib/buzz/README.md
    R demos/prefsFramework-jQueryUI/lib/buzz/js/buzz.js
    R demos/prefsFramework-jQueryUI/lib/html5shiv/js/html5shiv.js
    R demos/prefsFramework-jQueryUI/lib/html5shiv/readme.md
    R demos/prefsFramework-jQueryUI/messages/simplify.json
    R demos/prefsFramework-jQueryUI/templates/FatPanelUIOptions.html
    R demos/prefsFramework-jQueryUI/templates/UIOptionsTemplate-selfVoicing.html
    R demos/prefsFramework-jQueryUI/templates/UIOptionsTemplate-simplifiedContent.html
    A demos/prefsFramework/index-jQueryUI.html

  Log Message:
  -----------
  FLUID-5892: place jQuery demo in existing prefsFramework directory

  Commit: 37df5b7c226fb864c0114781d57a282db7b4d3fa
      https://github.com/fluid-project/infusion/commit/37df5b7c226fb864c0114781d57a282db7b4d3fa
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    R demos/prefsFramework/index-jQueryUI.html
    A demos/prefsFramework/jqueryUI-widgets.html

  Log Message:
  -----------
  FLUID-5892: rename demo file

  Commit: 3f9182a82d1749547b2dc88b4e43771047d800e2
      https://github.com/fluid-project/infusion/commit/3f9182a82d1749547b2dc88b4e43771047d800e2
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    R demos/prefsFramework/jqueryUI-widgets.html
    A examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html
    R examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame.html

  Log Message:
  -----------
  FLUID-5892: restructuring towards examples

  Commit: 59de524d0da24b20bcf8d9cc21c5919154862e3d
      https://github.com/fluid-project/infusion/commit/59de524d0da24b20bcf8d9cc21c5919154862e3d
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    R examples/framework/preferences/conditionalAdjusters-singlePanel/index.html
    A examples/framework/preferences/conditionalAdjusters-singlePanel/jQueryUI.html
    M examples/framework/preferences/conditionalAdjusters-singlePanel/js/auxiliarySchema.js
    R examples/framework/preferences/conditionalAdjusters/index.html
    A examples/framework/preferences/conditionalAdjusters/jQueryUI.html
    M examples/framework/preferences/conditionalAdjusters/js/auxiliarySchema.js
    A examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame-jQueryUI.html
    A examples/framework/preferences/shared/html/slider-template-jQueryUI.html
    R examples/framework/preferences/shared/html/slider-template.html

  Log Message:
  -----------
  FLUID-5892: jQueryUI versions of examples before working on native ones

  Commit: aed69b986c837c1acde10531861c072c7c582a55
      https://github.com/fluid-project/infusion/commit/aed69b986c837c1acde10531861c072c7c582a55
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M examples/framework/preferences/conditionalAdjusters/js/auxiliarySchema.js
    A examples/framework/preferences/conditionalAdjusters/nativeHTML.html
    M examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html
    A examples/framework/preferences/shared/html/slider-template-nativeHTML.html

  Log Message:
  -----------
  Beginning of native implementation (not working)

  Commit: 99fc6b87052efc5f3c29eaaafa513f2438b05e5b
      https://github.com/fluid-project/infusion/commit/99fc6b87052efc5f3c29eaaafa513f2438b05e5b
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js

  Log Message:
  -----------
  FLUID-5892: remove context-aware use of parent vs. iframe jQuery (some uses of native widgets seem to require in-iframe jQuery)

  Commit: 62b1caeba24205daa06591dd0703eda689fb5de4
      https://github.com/fluid-project/infusion/commit/62b1caeba24205daa06591dd0703eda689fb5de4
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html

  Log Message:
  -----------
  FLUID-5892: remove all jQueryUI, leave jQuery

  Commit: 310e9c3f7fc7aeed0919e9f4b12db57751c9a5b9
      https://github.com/fluid-project/infusion/commit/310e9c3f7fc7aeed0919e9f4b12db57751c9a5b9
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M examples/framework/preferences/conditionalAdjusters-singlePanel/js/auxiliarySchema.js
    A examples/framework/preferences/conditionalAdjusters-singlePanel/nativeHTML.html

  Log Message:
  -----------
  FLUID-5892: context-aware nativeHTML for second example

  Commit: 4d8aec06b81861a548456ecbb7db9903e08d2ae6
      https://github.com/fluid-project/infusion/commit/4d8aec06b81861a548456ecbb7db9903e08d2ae6
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2016-05-31 (Tue, 31 May 2016)

  Changed paths:
    M src/framework/preferences/js/Panels.js

  Log Message:
  -----------
  FLUID-5892: Fix for iframe binding issue in resetDom after inner jQuery is removed

  Commit: a444836890710f50e9bbea6b378465310870967d
      https://github.com/fluid-project/infusion/commit/a444836890710f50e9bbea6b378465310870967d
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-05-31 (Tue, 31 May 2016)

  Changed paths:
    M src/framework/preferences/js/Panels.js

  Log Message:
  -----------
  Merge pull request #2 from amb26/FLUID-5892

FLUID-5892: Fix for iframe binding issue in resetDom after inner jQuery is removed

  Commit: 607bfdb55b14e85e33d61c1c93f704824c6e1003
      https://github.com/fluid-project/infusion/commit/607bfdb55b14e85e33d61c1c93f704824c6e1003
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html

  Log Message:
  -----------
  FLUID-5892: remove jQuery include in iframe

  Commit: f0849e6b0fe965eebf9b85adcb17fc2484df2b61
      https://github.com/fluid-project/infusion/commit/f0849e6b0fe965eebf9b85adcb17fc2484df2b61
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M tests/framework-tests/preferences/html/Builder-test.html
    M tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    A tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html
    R tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M tests/framework-tests/preferences/js/BuilderTests.js
    A tests/framework-tests/preferences/js/CompositePanel.js
    M tests/framework-tests/preferences/js/FullNoPreviewPrefsEditorTests.js
    M tests/framework-tests/preferences/js/FullPreviewPrefsEditorTests.js
    M tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    M tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js

  Log Message:
  -----------
  FLUID-5892: Added and refactored unit tests

Added unit tests for a conditional panel in the separated panel test. Also performed some refactoring to opportunistically address some TODOs

  Commit: 6154271a4242c79f961d05595856d3807a8a68b7
      https://github.com/fluid-project/infusion/commit/6154271a4242c79f961d05595856d3807a8a68b7
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M tests/framework-tests/preferences/html/Builder-test.html
    M tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    A tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html
    R tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M tests/framework-tests/preferences/js/BuilderTests.js
    A tests/framework-tests/preferences/js/CompositePanel.js
    M tests/framework-tests/preferences/js/FullNoPreviewPrefsEditorTests.js
    M tests/framework-tests/preferences/js/FullPreviewPrefsEditorTests.js
    M tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    M tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js

  Log Message:
  -----------
  Merge branch 'FLUID-5892-unit-test' into FLUID-5892

  Commit: 2f40737c2ac1413b7169fcda292d700f72ee4cb7
      https://github.com/fluid-project/infusion/commit/2f40737c2ac1413b7169fcda292d700f72ee4cb7
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    M tests/framework-tests/preferences/js/CompositePanel.js
    M tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    M tests/framework-tests/preferences/testResources/html/checkboxTemplate.html

  Log Message:
  -----------
  FLUID-5892: Fixed bug in unit test and expanded assertions

Fixed a bug in the unit test where it would always fail because the class the selector was looking for wasn't in the template.
Also added more tests for the context and to verify the rendering of the conditional panel.

  Commit: d321f6999fcfba923b46adb242be8b01fd156886
      https://github.com/fluid-project/infusion/commit/d321f6999fcfba923b46adb242be8b01fd156886
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    A .eslintignore
    A .eslintrc
    M .gitignore
    R .jshintignore
    R .jshintrc
    M Gruntfile.js
    M demos/keyboard-a11y/js/keyboardDemo.js
    M demos/prefsFramework/js/changeClass.js
    M demos/prefsFramework/lib/html5shiv/js/html5shiv.js
    M demos/renderer/js/rendererDemo.js
    M demos/reorderer/gridReorderer/js/gridReordererDemo.js
    M demos/shared/js/overviewWrapper.js
    M package.json
    M src/components/inlineEdit/js/InlineEdit.js
    M src/components/inlineEdit/js/InlineEditIntegrations.js
    M src/components/pager/js/PagedTable.js
    M src/components/pager/js/Pager.js
    M src/components/reorderer/js/GeometricManager.js
    M src/components/tabs/js/Tabs.js
    M src/components/uploader/js/UploaderCompatibility-Infusion1.2.js
    M src/framework/core/js/DataBinding.js
    M src/framework/core/js/Fluid.js
    M src/framework/core/js/FluidDebugging.js
    M src/framework/core/js/FluidDocument.js
    M src/framework/core/js/FluidIoC.js
    M src/framework/core/js/FluidPromises.js
    M src/framework/core/js/FluidRequests.js
    M src/framework/core/js/FluidView.js
    M src/framework/core/js/FluidViewDebugging.js
    M src/framework/core/js/JavaProperties.js
    M src/framework/core/js/ModelTransformation.js
    M src/framework/core/js/ModelTransformationTransforms.js
    M src/framework/core/js/jquery.standalone.js
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/URLUtilities.js
    M src/framework/renderer/js/RendererUtilities.js
    M src/framework/renderer/js/fluidParser.js
    M src/framework/renderer/js/fluidRenderer.js
    M src/module/fluid.js
    M src/module/module.js
    M tests/all-tests.html
    M tests/component-tests/inlineEdit/js/InlineEditTests.js
    M tests/component-tests/reorderer/js/GeometricManagerTests.js
    M tests/component-tests/reorderer/js/LayoutReordererTests.js
    M tests/component-tests/tableOfContents/js/TableOfContentsTests.js
    M tests/component-tests/uploader/js/DemoUploadManagerTests.js
    M tests/component-tests/uploader/js/UploaderCompatibilityTests.js
    M tests/framework-tests/core/html/FluidIoCView-test.html
    M tests/framework-tests/core/js/DataBindingTests.js
    M tests/framework-tests/core/js/FluidDebuggingTests.js
    M tests/framework-tests/core/js/FluidIoCTests.js
    M tests/framework-tests/core/js/FluidIoCViewTests.js
    M tests/framework-tests/core/js/FluidJSTests.js
    M tests/framework-tests/core/js/FluidViewTests.js
    M tests/framework-tests/core/js/ModelTransformationTests.js
    M tests/framework-tests/core/js/WebWorkerTests-Worker.js
    R tests/framework-tests/jqUnit/html/jqUnit-tests.html
    R tests/framework-tests/jqUnit/js/jqUnit-tests.js
    M tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    M tests/framework-tests/preferences/js/PanelsTests.js
    M tests/framework-tests/preferences/js/PrefsEditorTests.js
    M tests/framework-tests/preferences/js/PrefsEditorTestsCommon.js
    M tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    M tests/framework-tests/preferences/js/URLUtilitiesTests.js
    M tests/framework-tests/renderer/js/RendererTests.js
    M tests/framework-tests/renderer/js/RendererUtilitiesTests.js
    M tests/manual-tests/components/reorderer/dynamic/js/dynamicReorderer.js
    M tests/manual-tests/framework/core/performance-fastInvokers/js/performance-test.js
    M tests/manual-tests/framework/core/performance-get/js/performance-test.js
    M tests/node-tests/basic-node-tests.js
    M tests/node-tests/node_modules/test-module/index.js
    A tests/node-tests/node_modules/test-module2/index.js
    A tests/node-tests/node_modules/test-module2/package.json
    M tests/test-core/jqUnit/js/jqUnit-browser.js
    M tests/test-core/jqUnit/js/jqUnit.js
    A tests/test-core/testTests/html/jqUnit-test.html
    A tests/test-core/testTests/js/jqUnitTests.js
    M tests/test-core/utils/js/IoCTestUtils.js

  Log Message:
  -----------
  Merge pull request #4 from fluid-project/master

merge upstream master

  Commit: ee97189b46a8fa0a3b0a43f56bfe9776bda41aa5
      https://github.com/fluid-project/infusion/commit/ee97189b46a8fa0a3b0a43f56bfe9776bda41aa5
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-06-10 (Fri, 10 Jun 2016)

  Changed paths:
    M tests/framework-tests/preferences/html/Builder-test.html
    M tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    A tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html
    R tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M tests/framework-tests/preferences/js/BuilderTests.js
    A tests/framework-tests/preferences/js/CompositePanel.js
    M tests/framework-tests/preferences/js/FullNoPreviewPrefsEditorTests.js
    M tests/framework-tests/preferences/js/FullPreviewPrefsEditorTests.js
    M tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    M tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    M tests/framework-tests/preferences/testResources/html/checkboxTemplate.html

  Log Message:
  -----------
  Merge pull request #3 from jobara/FLUID-5892

FLUID-5892: unit tests from @jobara for conditional panels when jQuery is not loaded in iframe

  Commit: 05a85150210cdbf59eff10ab408e9db1b963b023
      https://github.com/fluid-project/infusion/commit/05a85150210cdbf59eff10ab408e9db1b963b023
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-06-10 (Fri, 10 Jun 2016)

  Changed paths:
    M tests/framework-tests/preferences/js/BuilderTests.js

  Log Message:
  -----------
  FLUID-5892: fix a small issue in test - need to evaluate the 'checked' attribute to see if a checkbox is in a checked state rather than the input val()

  Commit: ce533cacadec06061b7c6503877698177671f467
      https://github.com/fluid-project/infusion/commit/ce533cacadec06061b7c6503877698177671f467
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-06-10 (Fri, 10 Jun 2016)

  Changed paths:
    R .eslintrc
    A .eslintrc.json
    M Gruntfile.js
    M src/module/fluid.js
    M tests/node-tests/basic-node-tests.js

  Log Message:
  -----------
  Merge pull request #5 from fluid-project/master

Merge upstream master.

  Commit: 359d8a430967571a74749b4fe1ad5dc7e62c7797
      https://github.com/fluid-project/infusion/commit/359d8a430967571a74749b4fe1ad5dc7e62c7797
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-06-10 (Fri, 10 Jun 2016)

  Changed paths:
    M tests/framework-tests/preferences/js/BuilderTests.js

  Log Message:
  -----------
  FLUID-5892: use prop('checked') rather than attr('checked')

  Commit: 47308d1d7e0e5ab2398d3ccbfdd2fe5bfa9b7c87
      https://github.com/fluid-project/infusion/commit/47308d1d7e0e5ab2398d3ccbfdd2fe5bfa9b7c87
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-06-10 (Fri, 10 Jun 2016)

  Changed paths:
    A .eslintignore
    A .eslintrc.json
    M .gitignore
    R .jshintignore
    R .jshintrc
    M Gruntfile.js
    M demos/keyboard-a11y/js/keyboardDemo.js
    M demos/prefsFramework/js/changeClass.js
    M demos/prefsFramework/lib/html5shiv/js/html5shiv.js
    M demos/renderer/js/rendererDemo.js
    M demos/reorderer/gridReorderer/js/gridReordererDemo.js
    M demos/shared/js/overviewWrapper.js
    M package.json
    M src/components/inlineEdit/js/InlineEdit.js
    M src/components/inlineEdit/js/InlineEditIntegrations.js
    M src/components/pager/js/PagedTable.js
    M src/components/pager/js/Pager.js
    M src/components/reorderer/js/GeometricManager.js
    M src/components/tabs/js/Tabs.js
    M src/components/uploader/js/UploaderCompatibility-Infusion1.2.js
    M src/framework/core/js/DataBinding.js
    M src/framework/core/js/Fluid.js
    M src/framework/core/js/FluidDebugging.js
    M src/framework/core/js/FluidDocument.js
    M src/framework/core/js/FluidIoC.js
    M src/framework/core/js/FluidPromises.js
    M src/framework/core/js/FluidRequests.js
    M src/framework/core/js/FluidView.js
    M src/framework/core/js/FluidViewDebugging.js
    M src/framework/core/js/JavaProperties.js
    M src/framework/core/js/ModelTransformation.js
    M src/framework/core/js/ModelTransformationTransforms.js
    M src/framework/core/js/jquery.standalone.js
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/URLUtilities.js
    M src/framework/renderer/js/RendererUtilities.js
    M src/framework/renderer/js/fluidParser.js
    M src/framework/renderer/js/fluidRenderer.js
    M src/module/fluid.js
    M src/module/module.js
    M tests/all-tests.html
    M tests/component-tests/inlineEdit/js/InlineEditTests.js
    M tests/component-tests/reorderer/js/GeometricManagerTests.js
    M tests/component-tests/reorderer/js/LayoutReordererTests.js
    M tests/component-tests/tableOfContents/js/TableOfContentsTests.js
    M tests/component-tests/uploader/js/DemoUploadManagerTests.js
    M tests/component-tests/uploader/js/UploaderCompatibilityTests.js
    M tests/framework-tests/core/html/FluidIoCView-test.html
    M tests/framework-tests/core/js/DataBindingTests.js
    M tests/framework-tests/core/js/FluidDebuggingTests.js
    M tests/framework-tests/core/js/FluidIoCTests.js
    M tests/framework-tests/core/js/FluidIoCViewTests.js
    M tests/framework-tests/core/js/FluidJSTests.js
    M tests/framework-tests/core/js/FluidViewTests.js
    M tests/framework-tests/core/js/ModelTransformationTests.js
    M tests/framework-tests/core/js/WebWorkerTests-Worker.js
    R tests/framework-tests/jqUnit/html/jqUnit-tests.html
    R tests/framework-tests/jqUnit/js/jqUnit-tests.js
    M tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    M tests/framework-tests/preferences/js/PanelsTests.js
    M tests/framework-tests/preferences/js/PrefsEditorTests.js
    M tests/framework-tests/preferences/js/PrefsEditorTestsCommon.js
    M tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    M tests/framework-tests/preferences/js/URLUtilitiesTests.js
    M tests/framework-tests/renderer/js/RendererTests.js
    M tests/framework-tests/renderer/js/RendererUtilitiesTests.js
    M tests/manual-tests/components/reorderer/dynamic/js/dynamicReorderer.js
    M tests/manual-tests/framework/core/performance-fastInvokers/js/performance-test.js
    M tests/manual-tests/framework/core/performance-get/js/performance-test.js
    M tests/node-tests/basic-node-tests.js
    M tests/node-tests/node_modules/test-module/index.js
    A tests/node-tests/node_modules/test-module2/index.js
    A tests/node-tests/node_modules/test-module2/package.json
    M tests/test-core/jqUnit/js/jqUnit-browser.js
    M tests/test-core/jqUnit/js/jqUnit.js
    A tests/test-core/testTests/html/jqUnit-test.html
    A tests/test-core/testTests/js/jqUnitTests.js
    M tests/test-core/utils/js/IoCTestUtils.js

  Log Message:
  -----------
  FLUID-5892: merge upstream master, fix a merge conflict

  Commit: 8e41ec73bc87e00cdea47e3b882c2aa20ad1840f
      https://github.com/fluid-project/infusion/commit/8e41ec73bc87e00cdea47e3b882c2aa20ad1840f
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-06-10 (Fri, 10 Jun 2016)

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js

  Log Message:
  -----------
  FLUID-5892: linting

  Commit: 90af5e8d093c517bfdae8e3591b6675c08b6e090
      https://github.com/fluid-project/infusion/commit/90af5e8d093c517bfdae8e3591b6675c08b6e090
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M examples/framework/preferences/conditionalAdjusters-singlePanel/jQueryUI.html
    M examples/framework/preferences/conditionalAdjusters-singlePanel/js/auxiliarySchema.js
    M examples/framework/preferences/conditionalAdjusters-singlePanel/nativeHTML.html
    M examples/framework/preferences/conditionalAdjusters/jQueryUI.html
    M examples/framework/preferences/conditionalAdjusters/js/auxiliarySchema.js
    M examples/framework/preferences/conditionalAdjusters/nativeHTML.html
    A examples/framework/preferences/shared/js/contextAwareAuxSchemas.js

  Log Message:
  -----------
  FLUID-5892: Refactoring examples

- put auxiliary schema mixins into a shared file
- removed $(document).ready() functions from example html files
- removed a console log

  Commit: 19b3aee01bca33a4c7da9eb086e0bbd0d9bcb264
      https://github.com/fluid-project/infusion/commit/19b3aee01bca33a4c7da9eb086e0bbd0d9bcb264
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M tests/framework-tests/preferences/html/Builder-test.html
    M tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    R tests/framework-tests/preferences/js/CompositePanel.js
    A tests/framework-tests/preferences/js/CompositePanelTestsGrades.js

  Log Message:
  -----------
  FLUID-5892: Renamed file in tests

CompositePanel.js -> CompositePanelTestsGrades.js

  Commit: 57a9a3203f7e154b85b0183f0a86d234b2b080ea
      https://github.com/fluid-project/infusion/commit/57a9a3203f7e154b85b0183f0a86d234b2b080ea
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M .eslintrc.json
    M Vagrantfile
    M demos/prefsFramework/index.html
    M demos/uiOptions/index.html
    M examples/framework/preferences/conditionalAdjusters-singlePanel/jQueryUI.html
    M examples/framework/preferences/conditionalAdjusters-singlePanel/nativeHTML.html
    M examples/framework/preferences/conditionalAdjusters/jQueryUI.html
    M examples/framework/preferences/conditionalAdjusters/nativeHTML.html
    M examples/framework/preferences/minimalEditor/index.html
    M examples/framework/preferences/usingGrades/index.html
    M provisioning/vars.yml
    M src/framework/core/frameworkDependencies.json
    A src/framework/core/js/ResourceLoader.js
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/PrefsEditor.js
    M src/framework/preferences/js/StarterGrades.js
    M tests/all-tests.html
    M tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js
    M tests/component-tests/uiOptions/html/UIOptions-test.html
    M tests/framework-tests/core/all-tests.html
    A tests/framework-tests/core/data/testTemplate1.html
    A tests/framework-tests/core/data/testTemplate2.html
    A tests/framework-tests/core/html/ResourceLoader-test.html
    A tests/framework-tests/core/js/ResourceLoaderTests.js
    M tests/framework-tests/preferences/html/AuxBuilder-test.html
    M tests/framework-tests/preferences/html/Builder-test.html
    M tests/framework-tests/preferences/html/Enactors-test.html
    M tests/framework-tests/preferences/html/FullNoPreviewPrefsEditor-test.html
    M tests/framework-tests/preferences/html/FullPreviewPrefsEditor-test.html
    M tests/framework-tests/preferences/html/PageEnhancer-test.html
    M tests/framework-tests/preferences/html/Panels-test.html
    M tests/framework-tests/preferences/html/PrefsEditor-test.html
    M tests/framework-tests/preferences/html/SelfVoicingEnactor-test.html
    M tests/framework-tests/preferences/html/SelfVoicingPanel-test.html
    M tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    M tests/framework-tests/preferences/html/UIEnhancer-test.html
    M tests/framework-tests/preferences/js/AuxBuilderTests.js
    M tests/framework-tests/preferences/js/PrefsEditorTests.js
    M tests/lib/qunit/js/qunit.js
    M tests/manual-tests/framework/preferences/assortedContent/index-jQueryUI.html
    M tests/manual-tests/framework/preferences/assortedContent/index-nativeHTML.html
    M tests/manual-tests/framework/preferences/fullPage-schema/index-jQueryUI.html
    M tests/manual-tests/framework/preferences/fullPage-schema/index-nativeHTML.html
    M tests/manual-tests/framework/preferences/fullPage/index-jQueryUI.html
    M tests/manual-tests/framework/preferences/fullPage/index-nativeHTML.html
    M tests/test-core/utils/js/IoCTestUtils.js

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

  Commit: 6d6d715152ac70564963671e9548b864d2622347
      https://github.com/fluid-project/infusion/commit/6d6d715152ac70564963671e9548b864d2622347
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M tests/manual-tests/framework/preferences/assortedContent/index-jQueryUI.html
    M tests/manual-tests/framework/preferences/assortedContent/index-nativeHTML.html

  Log Message:
  -----------
  FLUID-5892: Fixed typo javascript -> JavaScript

  Commit: 303035fabecfcd532dd702cc3770851729513421
      https://github.com/fluid-project/infusion/commit/303035fabecfcd532dd702cc3770851729513421
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js
    M tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5892: Cleanup of context setting in tests

  Commit: f48d47f9144a91bd47c326da03dd4e3b92dd4396
      https://github.com/fluid-project/infusion/commit/f48d47f9144a91bd47c326da03dd4e3b92dd4396
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    R examples/framework/preferences/conditionalAdjusters-singlePanel/index.html
    A examples/framework/preferences/conditionalAdjusters-singlePanel/jQueryUI.html
    M examples/framework/preferences/conditionalAdjusters-singlePanel/js/auxiliarySchema.js
    A examples/framework/preferences/conditionalAdjusters-singlePanel/nativeHTML.html
    R examples/framework/preferences/conditionalAdjusters/index.html
    A examples/framework/preferences/conditionalAdjusters/jQueryUI.html
    M examples/framework/preferences/conditionalAdjusters/js/auxiliarySchema.js
    A examples/framework/preferences/conditionalAdjusters/nativeHTML.html
    A examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame-jQueryUI.html
    A examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html
    R examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame.html
    A examples/framework/preferences/shared/html/slider-template-jQueryUI.html
    A examples/framework/preferences/shared/html/slider-template-nativeHTML.html
    R examples/framework/preferences/shared/html/slider-template.html
    A examples/framework/preferences/shared/js/contextAwareAuxSchemas.js
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M src/components/textfieldSlider/textfieldSliderDependencies.json
    A src/framework/preferences/html/PrefsEditorTemplate-lineSpace-jQueryUI.html
    A src/framework/preferences/html/PrefsEditorTemplate-lineSpace-nativeHTML.html
    R src/framework/preferences/html/PrefsEditorTemplate-lineSpace.html
    A src/framework/preferences/html/PrefsEditorTemplate-textSize-jQueryUI.html
    A src/framework/preferences/html/PrefsEditorTemplate-textSize-nativeHTML.html
    R src/framework/preferences/html/PrefsEditorTemplate-textSize.html
    A src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-jQueryUI.html
    A src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html
    R src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/js/StarterSchemas.js
    M tests/component-tests/textfieldSlider/html/TextfieldSlider-test.html
    M tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js
    M tests/framework-tests/preferences/html/Builder-test.html
    M tests/framework-tests/preferences/html/Panels-test.html
    M tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    A tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html
    R tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M tests/framework-tests/preferences/js/AuxBuilderTests.js
    M tests/framework-tests/preferences/js/BuilderTests.js
    A tests/framework-tests/preferences/js/CompositePanelTestsGrades.js
    M tests/framework-tests/preferences/js/FullNoPreviewPrefsEditorTests.js
    M tests/framework-tests/preferences/js/FullPreviewPrefsEditorTests.js
    M tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    M tests/framework-tests/preferences/js/PanelsTests.js
    M tests/framework-tests/preferences/js/PrefsEditorTests.js
    M tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    M tests/framework-tests/preferences/js/URLUtilitiesTests.js
    M tests/framework-tests/preferences/testResources/html/checkboxTemplate.html
    A tests/manual-tests/framework/preferences/assortedContent/index-jQueryUI.html
    A tests/manual-tests/framework/preferences/assortedContent/index-nativeHTML.html
    R tests/manual-tests/framework/preferences/assortedContent/index.html
    M tests/manual-tests/framework/preferences/assortedContent/js/assortedContent.js
    A tests/manual-tests/framework/preferences/fullPage-schema/index-jQueryUI.html
    A tests/manual-tests/framework/preferences/fullPage-schema/index-nativeHTML.html
    R tests/manual-tests/framework/preferences/fullPage-schema/index.html
    A tests/manual-tests/framework/preferences/fullPage/index-jQueryUI.html
    A tests/manual-tests/framework/preferences/fullPage/index-nativeHTML.html
    R tests/manual-tests/framework/preferences/fullPage/index.html

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

* justin/FLUID-5892:
  FLUID-5892: Cleanup of context setting in tests
  FLUID-5892: Fixed typo javascript -> JavaScript
  FLUID-5892: Renamed file in tests
  FLUID-5892: Refactoring examples
  FLUID-5892: linting
  FLUID-5892: use prop('checked') rather than attr('checked')
  FLUID-5892: fix a small issue in test - need to evaluate the 'checked' attribute to see if a checkbox is in a checked state rather than the input val()
  FLUID-5892: Fixed bug in unit test and expanded assertions
  FLUID-5892: Added and refactored unit tests
  FLUID-5892: remove jQuery include in iframe
  FLUID-5892: Fix for iframe binding issue in resetDom after inner jQuery is removed
  FLUID-5892: context-aware nativeHTML for second example
  FLUID-5892: remove all jQueryUI, leave jQuery
  FLUID-5892: remove context-aware use of parent vs. iframe jQuery (some uses of native widgets seem to require in-iframe jQuery)
  Beginning of native implementation (not working)
  FLUID-5892: jQueryUI versions of examples before working on native ones
  FLUID-5892: restructuring towards examples
  FLUID-5892: rename demo file
  FLUID-5892: place jQuery demo in existing prefsFramework directory
  FLUID-5892: jquery UI version of the demo
  FLUID-5892: use contextAwareness to decide whether iframe should have own jQuery, or is expected to use parent document one (destroy all implementation switches: the revenge)
  FLUID-5892: rename index.html to index-native.HTML so it's harder to miss that there are two manual tests
  FLUID-5892: use defaultGradeNames for nativeHTML usage rather than an explicit makeCheck
  FLUID-5892: refactor lineSpace tests to reduce duplicated code
  FLUID-5892: use consistent namespace approach in textSize tests
  FLUID-5892: refactor textSize tests to reduce duplicated code
  FLUID-5892: continue refactor
  FLUID-5892: in midst of test refactoring
  FLUID-5892: parameterize tests
  FLUID-5892: destroy all implementation switches
  FLUID-5892: more specific invoker/listener (setSliderAria -> setSliderAriaValueNow)
  FLUID-5892: factor combinedSliderOptions into jQueryUI slider only
  FLUID-5892: add enhancement (for ContextAwareness) to dependencies
  FLUID-5892: make a jqueryUI widgets version of the manual preferences test
  FLUID-5892: make a jqueryUI widgets version of the manual preferences test
  FLUID-5892: make a jqueryUI widgets version of the manual preferences test
  FLUID-5892: be consistent about pattern for namespacing nativeHTML vs. jQueryUI
  FLUID-5892: be consistent about pattern for namespacing nativeHTML vs. jQueryUI
  FLUID-5892: rename native/jQuery HTML templates to nativeHTML/jQueryUI (more precise)
  FLUID-5892: make manual test context-aware
  FLUID-5892: rename 'jQuery' to 'jQueryUI' to be more precise about context-awareness check
  FLUID-5892: merge remote changes
  FLUID-5892: use context awareness in textFieldSlider itself, rather than grade linkage (only set preference for native or jQuery in one place)
  FLUID-5892: make starterGrades context-aware for native vs. jquery
  FLUID-5892: context-aware starterGrades
  FLUID-5892: make SeparatedPanelPrefsEditor context-aware for loading native or jquery template
  FLUID-5892: separate SeparatedPanelPrefsEditorFrame into jQuery & native versions
  FLUID-5892: better comments about switching between native and jQuery slider
  FLUID-5892: initial implementation of context-aware textSize/lineSpace panels that respond to native/jQuery slider config
  FLUID-5892: make textSize and lineSpace panels configurable for native or jQuery slider
  FLUID-5892: use makeGradeLinkage to manage slider widget defaults
  FLUID-5892: add jQuery versions of the linespace/textsize templates
  FLUID-5892: rename lineSpace/textSize templates to include 'native' suffix
  FLUID-5892: use stringValue for raw value from widget, value for stringToNumber transform
  FLUID-5892: extract a base slider grade
  FLUID-5892: first pass at retaining jQuery-based slider as well as adding native one
  FLUID-5892: remove unused selector
  FLUID-5892: whitespace
  FLUID-5892: remove fl-slider-rangeInput styles (not used)
  FLUID-5892: update tests for new HTML5 slider implementation
  FLUID-5892: fix panel tests for new HTML5 slider implementation
  FLUID-5892: ensure slider value is always numeric
  FLUID-5892: further IoC refactoring; refactor HTML templates to use <input> for slider
  FLUID-5892: remove unneeded test markup
  FLUID-5892: use IoC for model updating
  FLUID-5892: that-ise tests
  FLUID-5892: add a basic CSS to inherit height and width from parent for slider
  FLUID-5892: update CSS
  FLUID-5892: use component configuration for setting slider value from model
  FLUID-5892: all tests passing now, need to refactor implementation
  FLUID-5892: refactoring to remove jQuery UI sliders completely; one test still not passing, investigating
  FLUID-5892: save initial work to use native range input slider rather than jquery plugin (using both sliders)

Compare: https://github.com/fluid-project/infusion/compare/78f89868fc94...f48d47f9144a