[Commits] [fluid-project/infusion] fa4c55: FLUID-5320: Simplified getLineHeight and tests

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: fa4c55416ac984d9fe7ed79bfc76574d906d88a1
      https://github.com/fluid-project/infusion/commit/fa4c55416ac984d9fe7ed79bfc76574d906d88a1
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-04-25 (Fri, 25 Apr 2014)

  Changed paths:
    M src/framework/preferences/js/Enactors.js
    M src/tests/framework-tests/preferences/js/EnactorsTests.js

  Log Message:
  -----------
  FLUID-5320: Simplified getLineHeight and tests

Simplified the getLineHeight to just return the value from jQuery's css method. Refactored the tests to test for the multiplier in IE8 and IE9 and to test for pixel values elsewhere.


  Commit: 688bcec13f2a0c80a9847ca4062444251a93941a
      https://github.com/fluid-project/infusion/commit/688bcec13f2a0c80a9847ca4062444251a93941a
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-04-25 (Fri, 25 Apr 2014)

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

  Log Message:
  -----------
  FLUID-5320: Fixed a typo in a comment


  Commit: 9db02ed3c1e15d80f7654d1a5802eabadce4d292
      https://github.com/fluid-project/infusion/commit/9db02ed3c1e15d80f7654d1a5802eabadce4d292
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-04-25 (Fri, 25 Apr 2014)

  Changed paths:
    M src/framework/preferences/js/Enactors.js
    M src/tests/framework-tests/preferences/js/EnactorsTests.js

  Log Message:
  -----------
  FLUID-5320: Renamed numerizeLineHeight

Renamed to getLineHeightMultiplier


  Commit: 17b78a4d19f22b5ffd004f26abb36395af4577ba
      https://github.com/fluid-project/infusion/commit/17b78a4d19f22b5ffd004f26abb36395af4577ba
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    M src/framework/preferences/js/Enactors.js
    M src/tests/framework-tests/preferences/html/Enactors-test.html
    M src/tests/framework-tests/preferences/js/EnactorsTests.js

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


  Commit: 2dd13019a607769391535774c927c719a5bc9718
      https://github.com/fluid-project/infusion/commit/2dd13019a607769391535774c927c719a5bc9718
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    R src/demos/fss/base/css/base.css
    R src/demos/fss/base/index.html
    R src/demos/fss/base/json/config.json
    R src/demos/fss/base/withBase.html
    R src/demos/fss/base/withoutBase.html
    R src/demos/fss/clearfix/css/clearfix.css
    R src/demos/fss/clearfix/index.html
    R src/demos/fss/clearfix/js/clearfixDemo.js
    R src/demos/fss/clearfix/json/config.json
    R src/demos/fss/contextual/css/context.css
    R src/demos/fss/contextual/index.html
    R src/demos/fss/contextual/json/config.json
    R src/demos/fss/layout/css/layout.css
    R src/demos/fss/layout/index.html
    R src/demos/fss/layout/json/config.json
    R src/demos/fss/linearize/css/linearize.css
    R src/demos/fss/linearize/images/picture_150.png
    R src/demos/fss/linearize/index.html
    R src/demos/fss/linearize/js/linearizeDemo.js
    R src/demos/fss/linearize/json/config.json
    R src/demos/fss/mobile/buttons/basic.html
    R src/demos/fss/mobile/content/basic.html
    R src/demos/fss/mobile/images/1.jpg
    R src/demos/fss/mobile/images/10.jpg
    R src/demos/fss/mobile/images/11.jpg
    R src/demos/fss/mobile/images/12.jpg
    R src/demos/fss/mobile/images/13.jpg
    R src/demos/fss/mobile/images/14.jpg
    R src/demos/fss/mobile/images/15.jpg
    R src/demos/fss/mobile/images/16.jpg
    R src/demos/fss/mobile/images/17.jpg
    R src/demos/fss/mobile/images/18.jpg
    R src/demos/fss/mobile/images/19.png
    R src/demos/fss/mobile/images/2.jpg
    R src/demos/fss/mobile/images/20.png
    R src/demos/fss/mobile/images/3.jpg
    R src/demos/fss/mobile/images/4.jpg
    R src/demos/fss/mobile/images/5.jpg
    R src/demos/fss/mobile/images/6.jpg
    R src/demos/fss/mobile/images/7.jpg
    R src/demos/fss/mobile/images/8.jpg
    R src/demos/fss/mobile/images/9.jpg
    R src/demos/fss/mobile/index.html
    R src/demos/fss/mobile/js/mobileDemo.js
    R src/demos/fss/mobile/json/config.json
    R src/demos/fss/mobile/nav/basic.html
    R src/demos/fss/mobile/nav/icon.html
    R src/demos/fss/mobile/nav/thumb.html
    R src/demos/fss/mobile/tabs/basic.html
    R src/demos/fss/reset/css/reset.css
    R src/demos/fss/reset/index.html
    R src/demos/fss/reset/json/config.json
    R src/demos/fss/reset/withReset.html
    R src/demos/fss/reset/withoutReset.html
    R src/demos/fss/text/index.html
    R src/demos/fss/text/json/config.json
    R src/demos/fss/themes/index.html
    R src/demos/fss/themes/json/config.json
    M src/tests/framework-tests/preferences/js/BuilderTests.js
    M src/tests/test-core/jqUnit/js/jqUnit.js

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


  Commit: a8efc674ca9007a8f75c574879df9abc280c6ad8
      https://github.com/fluid-project/infusion/commit/a8efc674ca9007a8f75c574879df9abc280c6ad8
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M src/tests/framework-tests/preferences/js/EnactorsTests.js

  Log Message:
  -----------
  FLUID-5320: Fixed typos


  Commit: cc8d78b3c82b968849335ee3da524fe3b2cb9cda
      https://github.com/fluid-project/infusion/commit/cc8d78b3c82b968849335ee3da524fe3b2cb9cda
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M src/framework/preferences/js/Enactors.js
    M src/tests/framework-tests/preferences/js/EnactorsTests.js

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

* justin/FLUID-5320:
  FLUID-5320: Fixed typos
  FLUID-5320: Renamed numerizeLineHeight
  FLUID-5320: Fixed a typo in a comment
  FLUID-5320: Simplified getLineHeight and tests


Compare: https://github.com/fluid-project/infusion/compare/35603beb05b5...cc8d78b3c82b