This repository has been archived by the owner on Oct 30, 2018. It is now read-only.
merge develop-perf into develop #799
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fixed bleed between loader and our use of its results
if process.stdout is not a tty (i.e. a pipe) the console.log interpreted the message as an object, not a (colorized) string. note: warn() & error() previously wrote to stdout, now write to stderr. cherry-picked from 3fd55c9 Conflicts: lib/management/utils.js
load all datatype-date-format language bundles
… static files through combo
…ne or ac.error themselves. It's possible for user code to overlook calling ac.done or ac.error and those processes will just quietly fill up the server without any notice. This code provides notice of such cases and triggers ac.error directly to advise the developer of possible issues. The value can be overridden by setting an MS count in the application config for contextTimeout.
…n the server side to avoid side effects of the loader trying to load stuff from CDN when running on the server side
…it is already set by YUI.applyConfig, avoid calling for store when it is really not needed.
… RS addons to control it through getAppGroupConfig method.
Add logic to time out contexts in 60 seconds if they don't call ac.done or ac.error
fix for mojito test app with coverage (updates pr703)
fix bz 5904449 garbled console output on node 0.8+
app group consolidation: -bypassing combine and base definition from yui->config when running in the server side to avoid side effects of the loader trying to load stuff from CDN when running on the server side. -removing appConfig->yui from the client runtime init structure since it is already set by YUI.applyConfig() in deploy.js - consolidating yui.config.groups.app setting. - defining a way for other RS addons to control it through store.yui.getAppGroupConfig method.
…tic-consolidation
add an arrow workaround to fix failures in old version firefox
small syntax changes to attempt to fix the jenkins jobs
fix tests as some german chars are not supported
param to specify YUI require path. per discussion on pr 780
780 discussion
…nstructions for the latest version of Mojito.
[docs] Reversed the order of the versions so that users will first see the instructions for the latest version of Mojito.
fix `mojito compile` fatal error
note! `mojito test mojit path/to/mojit -c` fails with Error: ENOENT../tmp/mojito-lib-inst/lib but error existed on develop-perf as well. will fix in subsequent PR.
TODO checked for 0.5.x?
port of fix to use relative path to mojito, and do not try to use npm's `require` pathing
pre-merge develop management, app/commands, app/archetypes
use handy `Store = require('lib/store')` instead
of the YUI multi-step & preload()
Conflicts: docs/dev_guide/code_exs/adding_assets.rst docs/dev_guide/code_exs/app_config.rst docs/dev_guide/code_exs/binding_events.rst docs/dev_guide/code_exs/calling_yql.rst docs/dev_guide/code_exs/dynamic_assets.rst docs/dev_guide/code_exs/framed_assets.rst docs/dev_guide/code_exs/global_assets.rst docs/dev_guide/code_exs/index.rst docs/dev_guide/code_exs/intermojit_communication.rst docs/dev_guide/code_exs/overview.rst docs/dev_guide/code_exs/query_params.rst docs/dev_guide/code_exs/route_config.rst docs/dev_guide/code_exs/simple_logging.rst docs/dev_guide/code_exs/simple_view_template.rst docs/dev_guide/code_exs/view_engines.rst docs/dev_guide/code_exs/views_multiple_devices.rst docs/dev_guide/code_exs/yui_modules.rst docs/dev_guide/getting_started/index.rst docs/dev_guide/getting_started/mojito_getting_started_tutorial.rst docs/dev_guide/getting_started/quickstart.rst docs/dev_guide/index.rst docs/dev_guide/intro/index.rst docs/dev_guide/intro/mojito_configuring.rst docs/dev_guide/intro/mojito_mvc.rst docs/dev_guide/quickstart/index.rst docs/dev_guide/reference/mojito_cmdline.rst docs/dev_guide/topics/index.rst docs/dev_guide/topics/mojito_hosting_container_reqs.rst examples/developer-guide/binding_events/mojits/PagerMojit/controller.server.js examples/developer-guide/configure_routing/mojits/RoutingMojit/models/model.server.js examples/developer-guide/device_views/mojits/device/models/model.server.js examples/developer-guide/generating_urls/mojits/GenURLMojit/tests/models/model.server-tests.js examples/developer-guide/hello/mojits/HelloMojit/tests/models/model.server-tests.js examples/developer-guide/inter-mojit/mojits/ReceiverMojit/controller.server.js examples/developer-guide/inter-mojit/mojits/ReceiverMojit/definition.json examples/developer-guide/inter-mojit/mojits/ReceiverMojit/tests/controller.server-tests.js examples/developer-guide/model_yql/mojits/flickr/controller.server.js examples/developer-guide/model_yql/mojits/flickr/models/model.server.js examples/developer-guide/multiple_mojits/mojits/HeaderMojit/models/model.server.js examples/developer-guide/scroll_views/mojits/scroll/models/model.server.js examples/developer-guide/simple_assets/mojits/simple/models/model.server.js examples/developer-guide/unittest_model_controller/mojits/flickr/tests/controller.server-tests.js examples/developer-guide/unittest_model_controller/mojits/flickr/tests/models/model.server-tests.js lib/app/addons/rs/config.js lib/app/archetypes/app/hybrid/mojits/top_frame/definition.json lib/app/archetypes/app/yahoo/mojits/.placeholder lib/app/archetypes/app/yahoo/package.json.hb lib/app/autoload/store.server.js lib/app/commands/start.js lib/app/commands/test.js lib/management/cli.js lib/management/utils.js lib/tests/fixtures/badfiles/mojits/M/definition.json package.json tests/func/applications/frameworkapp/yaml-config/mojits/simple/defaults.json tests/func/applications/frameworkapp/yaml-config/mojits/simple/specs/default.json tests/func/common/testmojitproxybroadcaststaticlisten2.js tests/func/examples/developerguide/test_yuimodule.js tests/run.js tests/unit/lib/app/addons/rs/test-url.js tests/unit/lib/app/autoload/test-store.server.js
Conflicts: lib/app/commands/build/index.js
|
Boss says "merge it, and we'll fix problems that come up". |
drewfish
added a commit
that referenced
this pull request
Nov 28, 2012
merge develop-perf into develop
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.