Merge branch 'master' into 3.x

Conflicts: build/loader-yui3/loader-yui3-coverage.js build/loader-yui3/loader-yui3-debug.js build/loader-yui3/loader-yui3-min.js build/loader-yui3/loader-yui3.js build/loader/loader-debug.js build/loader/loader-min.js build/loader/loader.js build/yui/yui-debug.js build/yui/yui-min.js build/yui/yui.js src/loader/js/yui3.js
springuper · Aug 29, 2012 · c354544 · c354544
2 parents 61c8bd9 + fae40fd
commit c354544
Show file tree

Hide file tree

Showing 20 changed files with 36 additions and 99 deletions.
diff --git a/build/loader-yui3/loader-yui3-coverage.js b/build/loader-yui3/loader-yui3-coverage.js
diff --git a/build/loader-yui3/loader-yui3-debug.js b/build/loader-yui3/loader-yui3-debug.js
@@ -2208,8 +2208,7 @@ YUI.Env[Y.version].modules = YUI.Env[Y.version].modules || {
             "event-custom",
             "substitute",
             "json-stringify"
-        ],
-        "skinnable": true
+        ]
     },
     "test-console": {
         "requires": [
@@ -2471,7 +2470,7 @@ YUI.Env[Y.version].modules = YUI.Env[Y.version].modules || {
         ]
     }
 };
-YUI.Env[Y.version].md5 = '5fe7d71505fef8108b090c35db73bcde';
+YUI.Env[Y.version].md5 = '2631b5fb2c08064b4e8385f1142513e5';
 
 
 }, '@VERSION@', {"requires": ["loader-base"]});
diff --git a/build/loader-yui3/loader-yui3-min.js b/build/loader-yui3/loader-yui3-min.js
diff --git a/build/loader-yui3/loader-yui3.js b/build/loader-yui3/loader-yui3.js
@@ -2208,8 +2208,7 @@ YUI.Env[Y.version].modules = YUI.Env[Y.version].modules || {
             "event-custom",
             "substitute",
             "json-stringify"
-        ],
-        "skinnable": true
+        ]
     },
     "test-console": {
         "requires": [
@@ -2471,7 +2470,7 @@ YUI.Env[Y.version].modules = YUI.Env[Y.version].modules || {
         ]
     }
 };
-YUI.Env[Y.version].md5 = '5fe7d71505fef8108b090c35db73bcde';
+YUI.Env[Y.version].md5 = '2631b5fb2c08064b4e8385f1142513e5';
 
 
 }, '@VERSION@', {"requires": ["loader-base"]});
diff --git a/build/loader/loader-debug.js b/build/loader/loader-debug.js
@@ -5079,8 +5079,7 @@ YUI.Env[Y.version].modules = YUI.Env[Y.version].modules || {
             "event-custom",
             "substitute",
             "json-stringify"
-        ],
-        "skinnable": true
+        ]
     },
     "test-console": {
         "requires": [
@@ -5342,7 +5341,7 @@ YUI.Env[Y.version].modules = YUI.Env[Y.version].modules || {
         ]
     }
 };
-YUI.Env[Y.version].md5 = '5fe7d71505fef8108b090c35db73bcde';
+YUI.Env[Y.version].md5 = '2631b5fb2c08064b4e8385f1142513e5';
 
 
 }, '@VERSION@', {"requires": ["loader-base"]});

diff --git a/build/loader/loader-min.js b/build/loader/loader-min.js
diff --git a/build/loader/loader.js b/build/loader/loader.js
@@ -5037,8 +5037,7 @@ YUI.Env[Y.version].modules = YUI.Env[Y.version].modules || {
             "event-custom",
             "substitute",
             "json-stringify"
-        ],
-        "skinnable": true
+        ]
     },
     "test-console": {
         "requires": [
@@ -5300,7 +5299,7 @@ YUI.Env[Y.version].modules = YUI.Env[Y.version].modules || {
         ]
     }
 };
-YUI.Env[Y.version].md5 = '5fe7d71505fef8108b090c35db73bcde';
+YUI.Env[Y.version].md5 = '2631b5fb2c08064b4e8385f1142513e5';
 
 
 }, '@VERSION@', {"requires": ["loader-base"]});

diff --git a/build/test/test-coverage.js b/build/test/test-coverage.js
diff --git a/build/test/test-debug.js b/build/test/test-debug.js
@@ -3755,4 +3755,4 @@ if (!YUI.YUITest) {
 } //End if for YUI.YUITest
 
 
-}, '@VERSION@', {"requires": ["event-simulate", "event-custom", "substitute", "json-stringify"], "skinnable": true});
+}, '@VERSION@', {"requires": ["event-simulate", "event-custom", "substitute", "json-stringify"]});
diff --git a/build/test/test-min.js b/build/test/test-min.js
diff --git a/build/test/test.js b/build/test/test.js
@@ -3755,4 +3755,4 @@ if (!YUI.YUITest) {
 } //End if for YUI.YUITest
 
 
-}, '@VERSION@', {"requires": ["event-simulate", "event-custom", "substitute", "json-stringify"], "skinnable": true});
+}, '@VERSION@', {"requires": ["event-simulate", "event-custom", "substitute", "json-stringify"]});
diff --git a/build/yui/yui-debug.js b/build/yui/yui-debug.js
@@ -10789,8 +10789,7 @@ YUI.Env[Y.version].modules = YUI.Env[Y.version].modules || {
             "event-custom",
             "substitute",
             "json-stringify"
-        ],
-        "skinnable": true
+        ]
     },
     "test-console": {
         "requires": [
@@ -11052,7 +11051,7 @@ YUI.Env[Y.version].modules = YUI.Env[Y.version].modules || {
         ]
     }
 };
-YUI.Env[Y.version].md5 = '5fe7d71505fef8108b090c35db73bcde';
+YUI.Env[Y.version].md5 = '2631b5fb2c08064b4e8385f1142513e5';
 
 
 }, '@VERSION@', {"requires": ["loader-base"]});

diff --git a/build/yui/yui-min.js b/build/yui/yui-min.js
diff --git a/build/yui/yui.js b/build/yui/yui.js
@@ -10710,8 +10710,7 @@ YUI.Env[Y.version].modules = YUI.Env[Y.version].modules || {
             "event-custom",
             "substitute",
             "json-stringify"
-        ],
-        "skinnable": true
+        ]
     },
     "test-console": {
         "requires": [
@@ -10973,7 +10972,7 @@ YUI.Env[Y.version].modules = YUI.Env[Y.version].modules || {
         ]
     }
 };
-YUI.Env[Y.version].md5 = '5fe7d71505fef8108b090c35db73bcde';
+YUI.Env[Y.version].md5 = '2631b5fb2c08064b4e8385f1142513e5';
 
 
 }, '@VERSION@', {"requires": ["loader-base"]});

diff --git a/src/loader/js/yui3.js b/src/loader/js/yui3.js
@@ -2206,8 +2206,7 @@ YUI.Env[Y.version].modules = YUI.Env[Y.version].modules || {
             "event-custom",
             "substitute",
             "json-stringify"
-        ],
-        "skinnable": true
+        ]
     },
     "test-console": {
         "requires": [
@@ -2469,4 +2468,4 @@ YUI.Env[Y.version].modules = YUI.Env[Y.version].modules || {
         ]
     }
 };
-YUI.Env[Y.version].md5 = '5fe7d71505fef8108b090c35db73bcde';
+YUI.Env[Y.version].md5 = '2631b5fb2c08064b4e8385f1142513e5';
diff --git a/src/loader/js/yui3.json b/src/loader/js/yui3.json
@@ -2103,8 +2103,7 @@
             "event-custom",
             "substitute",
             "json-stringify"
-        ],
-        "skinnable": true
+        ]
     },
     "test-console": {
         "requires": [

diff --git a/src/test/build.properties b/src/test/build.properties
diff --git a/src/test/build.xml b/src/test/build.xml
diff --git a/src/test/meta/test.json b/src/test/meta/test.json
@@ -5,7 +5,6 @@
             "event-custom",
             "substitute",
             "json-stringify"
-        ], 
-        "skinnable": true
+        ]
     }
 }
diff --git a/src/yui/docs/partials/modules.mustache b/src/yui/docs/partials/modules.mustache
@@ -48,7 +48,7 @@
       </tr>
       <tr>
           <td>`app`</td>
-          <td>Alias module for: `app-base, app-transitions, lazy-model-list, model, model-list, model-sync-rest, router, view, view-node-map`</td>
+          <td>Alias module for: `app-base, app-content, app-transitions, lazy-model-list, model, model-list, model-sync-rest, router, view, view-node-map`</td>
       </tr>
       <tr>
           <td>`app-base`</td>