[Commits] [fluid-project/infusion] 6f9ae1: FLUID-4219: Added a TODO comment about code duplic...

noreply at github.com noreply at github.com
Tue Jul 26 22:23:25 UTC 2011


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion

  Commit: 6f9ae17354e5d7aca155f4484b780ecdc4a59173
      https://github.com/fluid-project/infusion/commit/6f9ae17354e5d7aca155f4484b780ecdc4a59173
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2011-07-25 (Mon, 25 Jul 2011)

  Changed paths:
    M build-scripts/dependency.js

  Log Message:
  -----------
  FLUID-4219: Added a TODO comment about code duplication between dependency.js and build-core.js as per michelled's feedback.


  Commit: 6c0294480e7dabc28d970e7377abe186e96603fc
      https://github.com/fluid-project/infusion/commit/6c0294480e7dabc28d970e7377abe186e96603fc
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2011-07-25 (Mon, 25 Jul 2011)

  Changed paths:
    M README.txt
  M ReleaseNotes.txt
  A build-scripts/build-README.txt
  A src/webapp/components/tableOfContents/css/TableOfContents.css
  M src/webapp/components/tableOfContents/html/TableOfContents.html
  M src/webapp/components/tableOfContents/js/TableOfContents.js
  M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
  M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
  M src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
  M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
  M src/webapp/components/uiOptions/js/UIEnhancer.js
  M src/webapp/components/uiOptions/js/UIOptions.js
  M src/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/FatPanelUIOptions/js/fatPanelUIOptions.js
  M src/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/FullPreviewUIOptions/html/UIOptionsPreview.html
  M src/webapp/demos/uiOptions/FullPreviewUIOptions/html/uiOptions.html
  M src/webapp/framework/core/js/Fluid.js
  M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-bg_flat_75_ffffff_40x100.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-bg_glass_65_ffffff_1x400.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-bg_glass_75_dadada_1x400.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-bg_inset-soft_95_fef1ec_1x100.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-icons_222222_256x240.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-icons_2e83ff_256x240.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-icons_454545_256x240.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-icons_888888_256x240.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-icons_cd0a0a_256x240.png
  M src/webapp/lib/jquery/ui/css/default-theme/jquery.ui.theme.css
  M src/webapp/standalone-demos/table-of-contents/html/TableOfContents.html
  A src/webapp/standalone-demos/table-of-contents/js/table-of-contents-example.js
  M src/webapp/tests/component-tests/tableOfContents/html/TableOfContents-test.html
  M src/webapp/tests/component-tests/tableOfContents/js/TableOfContentsTests.js
  M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
  M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
  M src/webapp/tests/framework-tests/core/js/FluidJSTests.js
  M src/webapp/tests/manual-tests/html/SomeKindOfNews.html
  M src/webapp/tests/manual-tests/js/someKindOfNews.js

  Log Message:
  -----------
  Merge branch 'FLUID-4219', remote branch 'upstream/master' into FLUID-4219

* upstream/master: (93 commits)
  FLUID-4251: Improvements to the README and release notes, as well as a new readme for the build system.
  FLUID-4317: more fix on ui enhancer unit tests.
  FLUID-4317: More fix on ui enhancer unit tests.
  FLUID-4317: Fixed the ui enhancer unit tests. Modified a bunch of file permissions from 755 to 644.
  FLUID-4317: removed the deprecated default definition of table of content template url from UI enhancer.
  FLUID-4348: removed pageEnhancer from fat panel IoC tree to ensure its configurability.
  FLUID-4317: Merged and integrated the new table of content component from harris/FLUID-4209.
  FLUID-4350: Implementation of fluid.generateGuid() which produces very likely unique ids
  FLUID-4317: Fixed the unit test hanging issue in chrome. The left issue is that the fat panel demo fails due to a framework unique id generation issue.
  FLUID-4317: A buggy experiment with the fix on the issue that the ui options unit tests hang on chrome.
  FLUID-4209: Use fluid.allocateSimpleId() instead
  FLUID-4349: Changed to a falsy check
  FLUID-4349: fluid.allocateSimpleId() improved
  FLUID-4317: Intermediate commit for uiOptions unit tests that injects uiEnhancer directly into test component IoC tree, which fixes the potential issue caused by the fact that each call to pageEnhancer registers an entry to static environment. Although this approach does not fix the original issue that the run hangs on the second test case in chrome, ie and safari, but passes in firefox.
  FLUID-4317: code clean up - replace tabs with spaces.
  FLUID-4317: Added more unit test for uiOptins.templateLoader. More fix is followed to fix the issue that the unit tests hang on chrome, ie and safari.
  FLUID-4209: Fixed a problem with IE7,8 substr
  FLUID-4209: Refractored standalone code
  FLUID-4209: jslint and removed comments
  FLUID-4209: Refractored code and added comments
  ...

* FLUID-4219:


  Commit: c8d74a7974000b9e1211a2bd5cef7d6cb3080eb2
      https://github.com/fluid-project/infusion/commit/c8d74a7974000b9e1211a2bd5cef7d6cb3080eb2
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2011-07-26 (Tue, 26 Jul 2011)

  Changed paths:
    M build-scripts/build.xml
  M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
  M src/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/FullPreviewUIOptions/html/UIOptionsPreview.html
  M src/webapp/demos/uiOptions/FullPreviewUIOptions/html/uiOptions.html
  R src/webapp/integration-demos/sakai/css/sakai.components.ui-options.css
  M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
  M src/webapp/integration-demos/uportal/html/portal.html
  M src/webapp/tests/manual-tests/html/SomeKindOfNews.html

  Log Message:
  -----------
  FLUID-4219: Updating all UI Options demos and examples to use the generated UI Options versions of the themes.


  Commit: 6695d855c1156f60d8bf4ae62ccf3ff26c39a295
      https://github.com/fluid-project/infusion/commit/6695d855c1156f60d8bf4ae62ccf3ff26c39a295
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2011-07-26 (Tue, 26 Jul 2011)

  Changed paths:
    M ReleaseNotes.txt
  A build-scripts/build-core.js
  R build-scripts/build.js
  M build-scripts/build.properties
  M build-scripts/build.xml
  M build-scripts/buildutils.xml
  A build-scripts/dependency.js
  A build-scripts/importantInjection.json
  A build-scripts/lib/jscssp/LICENSE.txt
  A build-scripts/lib/jscssp/js/jscssp.js
  A build-scripts/lib/rhino/bsf.jar
  A build-scripts/lib/rhino/commons-logging-1.1.1.jar
  A build-scripts/lib/rhino/js.jar
  A build-scripts/uiOptions/js/BrowserStylesheetHandler.js
  A build-scripts/uiOptions/js/CSSGenerator.js
  A build-scripts/uiOptions/js/RhinoStylesheetHandler.js
  A build-scripts/uiOptions/js/StylesheetImportant.js
  M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
  M src/webapp/components/uiOptions/js/UIEnhancer.js
  M src/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/FullPreviewUIOptions/html/UIOptionsPreview.html
  M src/webapp/demos/uiOptions/FullPreviewUIOptions/html/uiOptions.html
  R src/webapp/integration-demos/sakai/css/sakai.components.ui-options.css
  M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
  M src/webapp/integration-demos/uportal/html/portal.html
  A src/webapp/tests/3rd-party-tests/jscssp/html/jscsspTests.html
  A src/webapp/tests/3rd-party-tests/jscssp/js/jscsspTests.js
  A src/webapp/tests/component-tests/uiOptions/css/test-theme.css
  A src/webapp/tests/component-tests/uiOptions/html/CSSGenerator-test.html
  A src/webapp/tests/component-tests/uiOptions/js/CSSGeneratorTests.js
  M src/webapp/tests/manual-tests/html/SomeKindOfNews.html

  Log Message:
  -----------
  Merge remote-tracking branch 'colin/FLUID-4219'

* colin/FLUID-4219:
  FLUID-4219: Updating all UI Options demos and examples to use the generated UI Options versions of the themes.
  FLUID-4219: Added a TODO comment about code duplication between dependency.js and build-core.js as per michelled's feedback.
  FLUID-4219: Minor logging tidy up.
  FLUID-4219: Updated UI Enhancer to use the new UI Options-specific !importanized themes.
  FLUID-4219: Minor tidying and renaming of the dependency management code in the Infusion build. This still needs to be resovled with the new build-core code.
  FLUID-4219: Switched to https://github.com/FGRibreau/JSCSSP version of CSS Parser. Added basic tests for the parser. Updated scripts.
  FLUID-4219: Committing failing tests showing potential bug in jscssp parser.
  FLUID-4219: Ressurrecting the rest of the build with change to Rhino 1.7R3.
  FLUID-4219: Simplified algorithm for replacing selectors. Seems to be an issue with replacing rules with element selectors in them.
  FLUID-4219:  Committing rest of the files related to the previous commit:  * Ant build now uses Rhino 1.7R3  * CSSGenerator has been refactored and can now rewrite selectors  * StylesheetImportant.js now renames themes so there's no risk of conflict with the standard, "unimportant" themes
  FLUID-4219: Upgraded to latest Rhino to avoid crazy scoping issues with eval. CSSGenerator refactoring for theme renaming.
  FLUID-4219: generated css no written to uio dir
  FLUID-4219: Important injections working with eval
  FLUID-4219: Adding JSON to the bootstrapper
  FLUID-4219: Working CSS generation for !important, after temporarily hacking around Rhino's strict eval().
  FLUID-4219: Now reading in files from the injection module
  FLUID-4219: Moving the injection module
  FLUID-4219: Refactored the important injection module
  FLUID-4237: CRLF to LF
  FLUID-4219: added a module for files that need injection
  Merge branch 'FLUID-4219', remote branch 'jobara/FLUID-4219' into FLUID-4219
  FLUID-4219: Refactoring to use eval, not done yet
  FLUID-4219: Moved the css ant properties
  FLUID-4219: searching a directory for !important injection
  FLUID-4219: saving new style sheets
  FLUID-4219: hardcoded css files to get !important
  FLUID-4219: missed commiting build.xml update
  FLUID-4219: Minor refactoring to call cssGeneration
  FLUID-4219: Added stylesheet handler files to the repository.
  FLUID-4219: Rhino-based stylesheet !important injection
  FLUID-4219: New Ant target
  FLUID-4219: More robust handling of priorities based on selectors.
  FLUID-4219: Prototypal implementation of CSS !important injection for UI Options.


Compare: https://github.com/fluid-project/infusion/compare/11ec3fa...6695d85


More information about the Commits mailing list