[Commits] [fluid-project/infusion] 182ef6: Merge branch 'fluid-project-master'

GitHub noreply at github.com
Thu Sep 15 19:15:57 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: 182ef6344fb4faa390057b7605392427d21dd779
      https://github.com/fluid-project/infusion/commit/182ef6344fb4faa390057b7605392427d21dd779
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-09-14 (Wed, 14 Sep 2016)

  Changed paths:
    M .eslintrc.json
    M .gitignore
    M Gruntfile.js
    M Vagrantfile
    M demos/inlineEdit/index.html
    M demos/inlineEdit/js/inlineEditDemo.js
    M demos/pager/index.html
    M demos/pager/js/pagerDemo.js
    M demos/prefsFramework/css/main.css
    R demos/prefsFramework/images/feature_stories_bullet.png
    R demos/prefsFramework/images/head_commerce.png
    A demos/prefsFramework/images/head_title_grey.png
    R demos/prefsFramework/images/mid_nav_bullet-black.gif
    R demos/prefsFramework/images/mid_nav_bullet-white.gif
    R demos/prefsFramework/images/mid_nav_bullet-yellow.gif
    R demos/prefsFramework/images/mid_nav_bullet.png
    M demos/progress/css/progress.css
    M demos/progress/index.html
    M demos/progress/js/progressDemo.js
    M demos/renderer/css/renderer.css
    M demos/renderer/index.html
    M demos/renderer/js/rendererDemo.js
    M demos/reorderer/gridReorderer/css/gridReorderer.css
    M demos/reorderer/gridReorderer/index.html
    R demos/reorderer/gridReorderer/js/gridReordererDemo.js
    M demos/reorderer/imageReorderer/index.html
    R demos/reorderer/imageReorderer/js/imageReordererDemo.js
    M demos/reorderer/layoutReorderer/index.html
    R demos/reorderer/layoutReorderer/js/layoutReordererDemo.js
    M demos/reorderer/listReorderer/index.html
    R demos/reorderer/listReorderer/js/listReordererDemo.js
    M demos/tableOfContents/index.html
    R demos/tableOfContents/js/tableOfContentsDemo.js
    M demos/uploader/index.html
    M demos/uploader/js/uploaderDemo.js
    M package.json
    M src/components/textToSpeech/js/TextToSpeech.js
    M src/framework/core/js/FluidIoC.js
    M src/framework/core/js/ModelTransformationTransforms.js
    M src/framework/preferences/js/Enactors.js
    M src/framework/preferences/js/FullNoPreviewPrefsEditor.js
    M src/framework/preferences/js/FullPreviewPrefsEditor.js
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/module/fluid.js
    M tests/component-tests/textToSpeech/html/TextToSpeech-test.html
    M tests/component-tests/textToSpeech/js/TextToSpeechTests.js
    M tests/framework-tests/core/js/FluidIoCTests.js
    M tests/framework-tests/core/js/FluidViewTests.js
    M tests/framework-tests/renderer/js/RendererTests.js
    M tests/testem.json

  Log Message:
  -----------
  Merge branch 'fluid-project-master'


  Commit: 6ee5b05078ff73072affe2cde3c501100c0d23e2
      https://github.com/fluid-project/infusion/commit/6ee5b05078ff73072affe2cde3c501100c0d23e2
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-09-14 (Wed, 14 Sep 2016)

  Changed paths:
    M tests/manual-tests/components/inlineEdit/rich/index.html
    M tests/manual-tests/components/inlineEdit/rich/js/inlineEditDemo.js

  Log Message:
  -----------
  FLUID-5719: source rich text editor sources from cdnjs.


  Commit: 9b6197ccad056091459c4a45307a601b5f9f83af
      https://github.com/fluid-project/infusion/commit/9b6197ccad056091459c4a45307a601b5f9f83af
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M src/components/inlineEdit/js/InlineEdit.js
    M src/components/inlineEdit/js/InlineEditIntegrations.js

  Log Message:
  -----------
  FLUID-5719: Updated inlineEdit for Tiny MCE 4.4.3

Removed the work around for Tiny MCE 3.4.9.

Removed the fluid.setCaretToEnd method. The only feature which seemed to still
be needed was to set focus on the editField. This is now handled by just calling
that.editField.focus() instead.


  Commit: 68adc5f70fd520acb33e0d847fb6e567c86485fa
      https://github.com/fluid-project/infusion/commit/68adc5f70fd520acb33e0d847fb6e567c86485fa
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M src/components/inlineEdit/js/InlineEdit.js
    M src/components/inlineEdit/js/InlineEditIntegrations.js
    M tests/manual-tests/components/inlineEdit/rich/index.html
    M tests/manual-tests/components/inlineEdit/rich/js/inlineEditDemo.js

  Log Message:
  -----------
  Merge remote-tracking branch 'alan/FLUID-5719'

* alan/FLUID-5719:
  FLUID-5719: Updated inlineEdit for Tiny MCE 4.4.3
  FLUID-5719: source rich text editor sources from cdnjs.


Compare: https://github.com/fluid-project/infusion/compare/c8457da92655...68adc5f70fd5


More information about the Commits mailing list