[Commits] [fluid-project/infusion] ad99bd: FLUID-4725: Modify inlineEdit to change invitation...

GitHub noreply at github.com
Wed Jul 18 15:04:11 UTC 2012


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: ad99bd886103dfd06d2ef4e0f49168073f5f24b5
      https://github.com/fluid-project/infusion/commit/ad99bd886103dfd06d2ef4e0f49168073f5f24b5
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M src/webapp/components/inlineEdit/js/InlineEdit.js
    M src/webapp/demos/inlineEdit/simple/js/inlineEditDemo.js
    M src/webapp/tests/component-tests/inlineEdit/js/InlineEditTests.js

  Log Message:
  -----------
  FLUID-4725: Modify inlineEdit to change invitation text of empty field on keyboard focus.

Also add support for modern strings-object based specification of defaultViewText.


  Commit: e36a823f934b294b6f95c4d6bebfe17025504f98
      https://github.com/fluid-project/infusion/commit/e36a823f934b294b6f95c4d6bebfe17025504f98
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M ReleaseNotes.txt
    M src/webapp/components/inlineEdit/js/InlineEdit.js
    M src/webapp/components/inlineEdit/js/InlineEditIntegrations.js
    M src/webapp/components/reorderer/js/Reorderer.js
    M src/webapp/demos/reorderer/layoutReorderer/html/layoutReorderer.html
    M src/webapp/framework/core/js/DataBinding.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/framework/core/js/FluidView.js
    M src/webapp/lib/jquery/core/js/jquery.js
    M src/webapp/lib/jquery/ui/js/jquery.ui.core.js
    M src/webapp/lib/jquery/ui/js/jquery.ui.dialog.js
    M src/webapp/lib/jquery/ui/js/jquery.ui.draggable.js
    M src/webapp/lib/jquery/ui/js/jquery.ui.mouse.js
    M src/webapp/lib/jquery/ui/js/jquery.ui.position.js
    M src/webapp/lib/jquery/ui/js/jquery.ui.slider.js
    M src/webapp/lib/jquery/ui/js/jquery.ui.tabs.js
    M src/webapp/lib/jquery/ui/js/jquery.ui.widget.js
    M src/webapp/lib/jquery/ui/js/ui-FLUID-readme.txt
    M src/webapp/tests/component-tests/reorderer/js/ImageReordererTestConstants.js
    M src/webapp/tests/component-tests/reorderer/js/ImageReordererTests.js
    M src/webapp/tests/component-tests/uploader/js/FileQueueViewTests.js

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

Conflicts: resolved
	src/webapp/components/inlineEdit/js/InlineEdit.js


  Commit: c5b00499223c67f5c3a3cd52495beb1424fd61fc
      https://github.com/fluid-project/infusion/commit/c5b00499223c67f5c3a3cd52495beb1424fd61fc
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M src/webapp/components/uploader/js/UploaderCompatibility-Infusion1.2.js
    M src/webapp/components/uploader/js/UploaderCompatibility-Infusion1.3.js
    M src/webapp/framework/core/js/DataBinding.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/tests/framework-tests/core/js/DataBindingTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js

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


  Commit: 818484d657f4f113a952b7d7d9ebc1394ab342d9
      https://github.com/fluid-project/infusion/commit/818484d657f4f113a952b7d7d9ebc1394ab342d9
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M src/webapp/components/inlineEdit/js/InlineEdit.js
    M src/webapp/tests/component-tests/inlineEdit/js/InlineEditTests.js

  Log Message:
  -----------
  FLUID-4725: Update 'defaultViewText' handling; reduce duplication in focus highlight handling


  Commit: a70d2138697718f8103d75ba46395e88df2280ef
      https://github.com/fluid-project/infusion/commit/a70d2138697718f8103d75ba46395e88df2280ef
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js

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


  Commit: 5421966d66b25122b668afd1558f61c03323bc79
      https://github.com/fluid-project/infusion/commit/5421966d66b25122b668afd1558f61c03323bc79
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

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

  Log Message:
  -----------
  FLUID-4725: Fix to bad toggling of invitation class


  Commit: 625d80d1e82cbbd5d874be0a75efd610bd71ad69
      https://github.com/fluid-project/infusion/commit/625d80d1e82cbbd5d874be0a75efd610bd71ad69
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M src/webapp/components/inlineEdit/js/InlineEdit.js
    M src/webapp/tests/component-tests/inlineEdit/js/InlineEditTests.js

  Log Message:
  -----------
  FLUID-4725: Update bindHighlightHander API to remove dependency on 'that'


  Commit: b743831c5afb272d3f87aeb41e592326933402be
      https://github.com/fluid-project/infusion/commit/b743831c5afb272d3f87aeb41e592326933402be
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M src/webapp/components/inlineEdit/js/InlineEdit.js
    M src/webapp/demos/inlineEdit/simple/js/inlineEditDemo.js
    M src/webapp/tests/component-tests/inlineEdit/js/InlineEditTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'acheetham/FLUID-4725'

* acheetham/FLUID-4725:
  FLUID-4725: Update bindHighlightHander API to remove dependency on 'that'
  FLUID-4725: Fix to bad toggling of invitation class
  FLUID-4725: Update 'defaultViewText' handling; reduce duplication in focus highlight handling
  FLUID-4725: Modify inlineEdit to change invitation text of empty field on keyboard focus.


Compare: https://github.com/fluid-project/infusion/compare/e86fed23b8ab...b743831c5afb


More information about the Commits mailing list