Merge branch 'live-docs' into dev-master

Conflicts: src/loader/HISTORY.md src/yui/HISTORY.md
blackcs · Sep 29, 2014 · cc905f8 · cc905f8
2 parents ed102b9 + 76f5b34
commit cc905f8
Show file tree

Hide file tree

Showing 151 changed files with 1,208 additions and 150 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "yui",
-  "version": "3.17.3-pre",
+  "version": "3.18.0",
   "main": "build/yui/yui.js",
   "devDependencies": {
     "pure": "0.4.2"

diff --git a/build/editor-selection/editor-selection-coverage.js b/build/editor-selection/editor-selection-coverage.js
diff --git a/build/editor-selection/editor-selection-debug.js b/build/editor-selection/editor-selection-debug.js
@@ -957,7 +957,7 @@ YUI.add('editor-selection', function (Y, NAME) {
         */
         removeCursor: function(keep) {
             var cur = this.getCursor();
-            if (cur) {
+            if (cur && cur.remove) {
                 if (keep) {
                     cur.set('innerHTML', '<br class="yui-cursor">');
                 } else {

diff --git a/build/editor-selection/editor-selection-min.js b/build/editor-selection/editor-selection-min.js
diff --git a/build/editor-selection/editor-selection.js b/build/editor-selection/editor-selection.js
@@ -941,7 +941,7 @@ YUI.add('editor-selection', function (Y, NAME) {
         */
         removeCursor: function(keep) {
             var cur = this.getCursor();
-            if (cur) {
+            if (cur && cur.remove) {
                 if (keep) {
                     cur.set('innerHTML', '<br class="yui-cursor">');
                 } else {

diff --git a/build/loader-base/loader-base-coverage.js b/build/loader-base/loader-base-coverage.js
diff --git a/build/loader-base/loader-base-debug.js b/build/loader-base/loader-base-debug.js
@@ -1118,12 +1118,18 @@ Y.Loader.prototype = {
      */
     addGroup: function(o, name) {
         var mods = o.modules,
-            self = this, i, v;
+            self = this,
+            defaultBase = o.defaultBase || Y.config.defaultBase,
+            i, v;
 
         name = name || o.name;
         o.name = name;
         self.groups[name] = o;
 
+        if (!o.base && defaultBase && o.root) {
+            o.base = defaultBase + o.root;
+        }
+
         if (o.patterns) {
             for (i in o.patterns) {
                 if (o.patterns.hasOwnProperty(i)) {

diff --git a/build/loader-base/loader-base-min.js b/build/loader-base/loader-base-min.js
diff --git a/build/loader-base/loader-base.js b/build/loader-base/loader-base.js
@@ -1115,12 +1115,18 @@ Y.Loader.prototype = {
      */
     addGroup: function(o, name) {
         var mods = o.modules,
-            self = this, i, v;
+            self = this,
+            defaultBase = o.defaultBase || Y.config.defaultBase,
+            i, v;
 
         name = name || o.name;
         o.name = name;
         self.groups[name] = o;
 
+        if (!o.base && defaultBase && o.root) {
+            o.base = defaultBase + o.root;
+        }
+
         if (o.patterns) {
             for (i in o.patterns) {
                 if (o.patterns.hasOwnProperty(i)) {

diff --git a/build/loader-pathogen-encoder/loader-pathogen-encoder-debug.js b/build/loader-pathogen-encoder/loader-pathogen-encoder-debug.js
@@ -1118,12 +1118,18 @@ Y.Loader.prototype = {
      */
     addGroup: function(o, name) {
         var mods = o.modules,
-            self = this, i, v;
+            self = this,
+            defaultBase = o.defaultBase || Y.config.defaultBase,
+            i, v;
 
         name = name || o.name;
         o.name = name;
         self.groups[name] = o;
 
+        if (!o.base && defaultBase && o.root) {
+            o.base = defaultBase + o.root;
+        }
+
         if (o.patterns) {
             for (i in o.patterns) {
                 if (o.patterns.hasOwnProperty(i)) {

diff --git a/build/loader-pathogen-encoder/loader-pathogen-encoder-min.js b/build/loader-pathogen-encoder/loader-pathogen-encoder-min.js
diff --git a/build/loader-pathogen-encoder/loader-pathogen-encoder.js b/build/loader-pathogen-encoder/loader-pathogen-encoder.js
@@ -1115,12 +1115,18 @@ Y.Loader.prototype = {
      */
     addGroup: function(o, name) {
         var mods = o.modules,
-            self = this, i, v;
+            self = this,
+            defaultBase = o.defaultBase || Y.config.defaultBase,
+            i, v;
 
         name = name || o.name;
         o.name = name;
         self.groups[name] = o;
 
+        if (!o.base && defaultBase && o.root) {
+            o.base = defaultBase + o.root;
+        }
+
         if (o.patterns) {
             for (i in o.patterns) {
                 if (o.patterns.hasOwnProperty(i)) {

diff --git a/build/loader/loader-debug.js b/build/loader/loader-debug.js
@@ -1118,12 +1118,18 @@ Y.Loader.prototype = {
      */
     addGroup: function(o, name) {
         var mods = o.modules,
-            self = this, i, v;
+            self = this,
+            defaultBase = o.defaultBase || Y.config.defaultBase,
+            i, v;
 
         name = name || o.name;
         o.name = name;
         self.groups[name] = o;
 
+        if (!o.base && defaultBase && o.root) {
+            o.base = defaultBase + o.root;
+        }
+
         if (o.patterns) {
             for (i in o.patterns) {
                 if (o.patterns.hasOwnProperty(i)) {

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
@@ -1115,12 +1115,18 @@ Y.Loader.prototype = {
      */
     addGroup: function(o, name) {
         var mods = o.modules,
-            self = this, i, v;
+            self = this,
+            defaultBase = o.defaultBase || Y.config.defaultBase,
+            i, v;
 
         name = name || o.name;
         o.name = name;
         self.groups[name] = o;
 
+        if (!o.base && defaultBase && o.root) {
+            o.base = defaultBase + o.root;
+        }
+
         if (o.patterns) {
             for (i in o.patterns) {
                 if (o.patterns.hasOwnProperty(i)) {

diff --git a/build/node-core/node-core-coverage.js b/build/node-core/node-core-coverage.js
diff --git a/build/node-core/node-core-debug.js b/build/node-core/node-core-debug.js
@@ -951,10 +951,20 @@ NodeList.addMethod = function(name, fn, context) {
     }
 };
 
+/**
+ * Import the named method, or methods from the host onto NodeList.
+ *
+ * @method importMethod
+ * @static
+ * @param {Object} host The object containing the methods to copy. Typically a prototype.
+ * @param {String|String[]} name The name, or an Array of names of the methods to import onto NodeList.
+ * @param {String} [altName] An alternative name to use for the method added to NodeList, which may differ from the name
+ * of the original host object. Has no effect if <em>name</em> is an array of method names.
+ */
 NodeList.importMethod = function(host, name, altName) {
     if (typeof name === 'string') {
         altName = altName || name;
-        NodeList.addMethod(name, host[name]);
+        NodeList.addMethod(altName, host[name]);
     } else {
         Y.Array.each(name, function(n) {
             NodeList.importMethod(host, n);

diff --git a/build/node-core/node-core-min.js b/build/node-core/node-core-min.js
diff --git a/build/node-core/node-core.js b/build/node-core/node-core.js
@@ -948,10 +948,20 @@ NodeList.addMethod = function(name, fn, context) {
     }
 };
 
+/**
+ * Import the named method, or methods from the host onto NodeList.
+ *
+ * @method importMethod
+ * @static
+ * @param {Object} host The object containing the methods to copy. Typically a prototype.
+ * @param {String|String[]} name The name, or an Array of names of the methods to import onto NodeList.
+ * @param {String} [altName] An alternative name to use for the method added to NodeList, which may differ from the name
+ * of the original host object. Has no effect if <em>name</em> is an array of method names.
+ */
 NodeList.importMethod = function(host, name, altName) {
     if (typeof name === 'string') {
         altName = altName || name;
-        NodeList.addMethod(name, host[name]);
+        NodeList.addMethod(altName, host[name]);
     } else {
         Y.Array.each(name, function(n) {
             NodeList.importMethod(host, n);

diff --git a/build/pjax-base/pjax-base-coverage.js b/build/pjax-base/pjax-base-coverage.js
diff --git a/build/pjax-base/pjax-base-debug.js b/build/pjax-base/pjax-base-debug.js
@@ -431,7 +431,7 @@ PjaxBase.ATTRS = {
     @attribute allowFallThrough
     @type Boolean
     @default true
-    @since @SINCE@
+    @since 3.18.0
     **/
     allowFallThrough: {
         value: true

diff --git a/build/pjax-base/pjax-base.js b/build/pjax-base/pjax-base.js
@@ -430,7 +430,7 @@ PjaxBase.ATTRS = {
     @attribute allowFallThrough
     @type Boolean
     @default true
-    @since @SINCE@
+    @since 3.18.0
     **/
     allowFallThrough: {
         value: true

diff --git a/build/yui-base/yui-base-coverage.js b/build/yui-base/yui-base-coverage.js