Permalink
Browse files

Merge pull request #150 from isao/develop

sync to 0.3.24
  • Loading branch information...
2 parents 78350ee + ad0619f commit eebfc49c433196ed2c43d883b457d7a8991d86f3 @mojit0 mojit0 committed May 11, 2012
Showing with 67 additions and 62 deletions.
  1. +2 −2 examples/developer-guide/binding_events/mojits/PagerMojit/controller.server.js
  2. +2 −2 examples/developer-guide/configure_routing/mojits/RoutingMojit/controller.server.js
  3. +2 −2 examples/developer-guide/device_assets/mojits/device/controller.server.js
  4. +2 −2 examples/developer-guide/device_views/mojits/device/controller.server.js
  5. +2 −2 examples/developer-guide/framed_assets/mojits/framed/controller.server.js
  6. +2 −2 examples/developer-guide/framed_config/mojits/MainMojit/controller.server.js
  7. +2 −2 examples/developer-guide/generating_urls/mojits/GenURLMojit/controller.server.js
  8. +2 −2 examples/developer-guide/global_assets/mojits/OhHai/controller.server.js
  9. +2 −2 examples/developer-guide/hello/mojits/HelloMojit/controller.server.js
  10. +2 −2 examples/developer-guide/htmlframe_mojit/mojits/framed/controller.server.js
  11. +2 −2 examples/developer-guide/inter-mojit/mojits/MasterMojit/controller.server.js
  12. +1 −1 examples/developer-guide/inter-mojit/mojits/ReceiverMojit/binders/index.js
  13. +2 −2 examples/developer-guide/inter-mojit/mojits/ReceiverMojit/controller.server.js
  14. +2 −2 examples/developer-guide/inter-mojit/mojits/SenderMojit/controller.server.js
  15. +2 −2 examples/developer-guide/locale_i18n/mojits/i18n/controller.server.js
  16. +2 −2 examples/developer-guide/model_yql/mojits/flickr/controller.server.js
  17. +2 −2 examples/developer-guide/multiple_mojits/mojits/BodyMojit/controller.server.js
  18. +2 −2 examples/developer-guide/multiple_mojits/mojits/FooterMojit/controller.server.js
  19. +2 −2 examples/developer-guide/multiple_mojits/mojits/FrameMojit/controller.server.js
  20. +2 −2 examples/developer-guide/multiple_mojits/mojits/HeaderMojit/controller.server.js
  21. +2 −2 examples/developer-guide/scroll_views/mojits/scroll/controller.server.js
  22. +2 −2 examples/developer-guide/simple_assets/mojits/simple/controller.server.js
  23. +2 −2 examples/developer-guide/simple_config/mojits/SimpleMojit/controller.server.js
  24. +1 −1 examples/developer-guide/simple_logging/mojits/log/controller.server.js
  25. +1 −1 examples/developer-guide/simple_view/mojits/simple/controller.server.js
  26. +2 −2 examples/developer-guide/unittest_model_controller/mojits/flickr/controller.server.js
  27. +2 −2 examples/developer-guide/using_configs/mojits/ContactUs/controller.server.js
  28. +2 −2 examples/developer-guide/using_cookies/mojits/CookieMojit/controller.server.js
  29. +2 −2 examples/developer-guide/using_parameters/mojits/QueryMojit/controller.server.js
  30. +2 −2 examples/developer-guide/yui_module/mojits/Notepad/controller.server.js
  31. +1 −1 examples/sandbox/ex1/mojits/Samuel/models/model.js
  32. +5 −1 source/lib/management/commands/test.js
  33. +3 −2 source/lib/store.server.js
  34. +1 −1 source/package.json
@@ -4,15 +4,15 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('PagerMojit', function(Y) {
+YUI.add('PagerMojit', function(Y, NAME) {
var PAGE_SIZE = 10;
/**
* Constructor for the Controller class.
* @class Controller
* @constructor
*/
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,8 +4,8 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('RoutingMojit', function(Y) {
- Y.mojito.controller = {
+YUI.add('RoutingMojit', function(Y, NAME) {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,8 +4,8 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('device', function(Y){
- Y.mojito.controller = {
+YUI.add('device', function(Y, NAME){
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,9 +4,9 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('device', function(Y) {
+YUI.add('device', function(Y, NAME) {
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,8 +4,8 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('framed', function(Y) {
- Y.mojito.controller = {
+YUI.add('framed', function(Y, NAME) {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,7 +4,7 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('MainMojit', function(Y) {
+YUI.add('MainMojit', function(Y, NAME) {
/**
* The MainMojit module.
@@ -18,7 +18,7 @@ YUI.add('MainMojit', function(Y) {
* @class Controller
* @constructor
*/
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
/**
* Method corresponding to the 'index' action.
@@ -4,8 +4,8 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('GenURLMojit', function(Y) {
- Y.mojito.controller = {
+YUI.add('GenURLMojit', function(Y, NAME) {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,9 +4,9 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('OhHai', function(Y) {
+YUI.add('OhHai', function(Y, NAME) {
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
index: function(ac) {
ac.done();
@@ -4,7 +4,7 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('HelloMojit', function(Y) {
+YUI.add('HelloMojit', function(Y, NAME) {
/**
* The HelloMojit module.
@@ -18,7 +18,7 @@ YUI.add('HelloMojit', function(Y) {
* @class Controller
* @constructor
*/
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
@@ -4,9 +4,9 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('framed', function(Y) {
+YUI.add('framed', function(Y, NAME) {
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,9 +4,9 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('MasterMojit', function(Y) {
+YUI.add('MasterMojit', function(Y, NAME) {
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
@@ -4,7 +4,7 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('ReceiverMojitBinderIndex', function(Y,NAME) {
+YUI.add('ReceiverMojitBinderIndex', function(Y, NAME) {
Y.namespace('mojito.binders')[NAME] = {
@@ -4,9 +4,9 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('ReceiverMojit', function(Y) {
+YUI.add('ReceiverMojit', function(Y, NAME) {
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,9 +4,9 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('SenderMojit', function(Y) {
+YUI.add('SenderMojit', function(Y, NAME) {
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,8 +4,8 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('i18n', function(Y) {
- Y.mojito.controller = {
+YUI.add('i18n', function(Y, NAME) {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,9 +4,9 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('flickr', function(Y) {
+YUI.add('flickr', function(Y, NAME) {
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,9 +4,9 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('BodyMojit', function(Y) {
+YUI.add('BodyMojit', function(Y, NAME) {
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,8 +4,8 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('FooterMojit', function(Y) {
- Y.mojito.controller = {
+YUI.add('FooterMojit', function(Y, NAME) {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,9 +4,9 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('FrameMojit', function(Y) {
+YUI.add('FrameMojit', function(Y, NAME) {
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,8 +4,8 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('HeaderMojit', function(Y) {
- Y.mojito.controller = {
+YUI.add('HeaderMojit', function(Y, NAME) {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,9 +4,9 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('scroll', function(Y) {
+YUI.add('scroll', function(Y, NAME) {
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,7 +4,7 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('simple', function(Y) {
+YUI.add('simple', function(Y, NAME) {
/**
* The simple module.
*
@@ -16,7 +16,7 @@ YUI.add('simple', function(Y) {
* @class Controller
* @constructor
*/
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,7 +4,7 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('SimpleMojit', function(Y) {
+YUI.add('SimpleMojit', function(Y, NAME) {
/**
* The SimpleMojit module.
@@ -18,7 +18,7 @@ YUI.add('SimpleMojit', function(Y) {
* @class Controller
* @constructor
*/
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
@@ -12,7 +12,7 @@ YUI.add('log', function(Y, NAME) {
* @class Controller
* @constructor
*/
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
@@ -5,7 +5,7 @@
*/
YUI.add('simple', function(Y, NAME) {
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,9 +4,9 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('flickr', function(Y) {
+YUI.add('flickr', function(Y, NAME) {
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,9 +4,9 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('ContactUs', function(Y) {
+YUI.add('ContactUs', function(Y, NAME) {
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
@@ -4,9 +4,9 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('CookieMojit', function(Y) {
+YUI.add('CookieMojit', function(Y, NAME) {
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,8 +4,8 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('QueryMojit', function(Y) {
- Y.mojito.controller = {
+YUI.add('QueryMojit', function(Y, NAME) {
+ Y.mojito.controllers[NAME] = {
init: function(config) {
this.config = config;
},
@@ -4,9 +4,9 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('Notepad', function(Y) {
+YUI.add('Notepad', function(Y, NAME) {
- Y.mojito.controller = {
+ Y.mojito.controllers[NAME] = {
index: function(ac) {
ac.done();
@@ -4,7 +4,7 @@
* See the accompanying LICENSE file for terms.
*/
-YUI.add('SamuelModel', function(Y,NAME) {
+YUI.add('SamuelModel', function(Y, NAME) {
Y.mojito.models['default'] = {
@@ -770,10 +770,14 @@ runTests = function(opts) {
};
if (coverage) {
- if (testType === 'app' || testType === 'mojit') {
+ if (testType === 'mojit') {
instrumentDirectory(path, verbose, testType, function() {
testRunner(pathlib.join(mojitoInstrumentedDir, 'lib'));
});
+ } else if (testType === 'app') {
+ instrumentDirectory(path, verbose, testType, function() {
+ testRunner(mojitoInstrumentedDir);
+ });
} else {
instrumentDirectory(targetMojitoPath, verbose, testType,
function() {
Oops, something went wrong.

0 comments on commit eebfc49

Please sign in to comment.