Merge branch 'dev-master' into dev-3.x

roosit · Aug 18, 2014 · b8a495e · b8a495e
2 parents a15fb3a + b53e5b1
commit b8a495e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/build/pluginhost-base/pluginhost-base-coverage.js b/build/pluginhost-base/pluginhost-base-coverage.js
diff --git a/build/pluginhost-base/pluginhost-base-debug.js b/build/pluginhost-base/pluginhost-base-debug.js
@@ -83,14 +83,18 @@ YUI.add('pluginhost-base', function (Y, NAME) {
                         if (this[ns].setAttrs) {
                             this[ns].setAttrs(config);
                         }
-                        else { Y.log("Attempt to replug an already attached plugin, and we can't setAttrs, because it's not Attribute based: " + ns); }
+                        else {
+                            Y.log("Attempt to replug an already attached plugin, and we can't setAttrs, because it's not Attribute based: " + ns, "warn", "PluginHost");
+                        }
                     } else {
                         // Create new instance
                         this[ns] = new Plugin(config);
                         this._plugins[ns] = Plugin;
                     }
                 }
-                else { Y.log("Attempt to plug in an invalid plugin. Host:" + this + ", Plugin:" + Plugin); }
+                else {
+                    Y.log("Attempt to plug in an invalid plugin. Host:" + this + ", Plugin:" + Plugin, "error", "PluginHost");
+                }
             }
             return this;
         },

diff --git a/build/pluginhost-base/pluginhost-base.js b/build/pluginhost-base/pluginhost-base.js
@@ -83,12 +83,16 @@ YUI.add('pluginhost-base', function (Y, NAME) {
                         if (this[ns].setAttrs) {
                             this[ns].setAttrs(config);
                         }
+                        else {
+                        }
                     } else {
                         // Create new instance
                         this[ns] = new Plugin(config);
                         this._plugins[ns] = Plugin;
                     }
                 }
+                else {
+                }
             }
             return this;
         },

diff --git a/src/pluginhost/HISTORY.md b/src/pluginhost/HISTORY.md
@@ -4,7 +4,9 @@ Plugin Host Change History
 @VERSION@
 ------
 
-* No changes.
+* [#1944][]: Fix an issue calls to `Y.log` in PluginHost are missing filter information. (@tribis)
+
+[#1944]: https://github.com/yui/yui3/pull/1944
 
 3.17.2
 ------

diff --git a/src/pluginhost/js/PluginHost.js b/src/pluginhost/js/PluginHost.js
@@ -81,14 +81,18 @@
                         if (this[ns].setAttrs) {
                             this[ns].setAttrs(config);
                         }
-                        else { Y.log("Attempt to replug an already attached plugin, and we can't setAttrs, because it's not Attribute based: " + ns); }
+                        else {
+                            Y.log("Attempt to replug an already attached plugin, and we can't setAttrs, because it's not Attribute based: " + ns, "warn", "PluginHost");
+                        }
                     } else {
                         // Create new instance
                         this[ns] = new Plugin(config);
                         this._plugins[ns] = Plugin;
                     }
                 }
-                else { Y.log("Attempt to plug in an invalid plugin. Host:" + this + ", Plugin:" + Plugin); }
+                else {
+                    Y.log("Attempt to plug in an invalid plugin. Host:" + this + ", Plugin:" + Plugin, "error", "PluginHost");
+                }
             }
             return this;
         },