#601 - replace with

yui · May 7, 2013 · bac20cb · bac20cb
1 parent 42b1b39
commit bac20cb
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 27 deletions.
diff --git a/build/widget-buttons/widget-buttons-coverage.js b/build/widget-buttons/widget-buttons-coverage.js
diff --git a/build/widget-buttons/widget-buttons-debug.js b/build/widget-buttons/widget-buttons-debug.js
@@ -606,16 +606,14 @@ WidgetButtons.prototype = {
         containerSelector = '.' + sectionClassName + ' .' + buttonsClassName;
 
         // Search only inside the current widget
-        contentBox.all(containerSelector).each(function(node, index) {
-            var widget;
+        contentBox.all(containerSelector).some(function(node){
+            var widget = Y.Widget.getByNode(node),
+                isBelongs = !widget || widget === this;
 
-            if (!container) {
-                widget = Y.Widget.getByNode(node);
-
-                if (!widget || widget === this) {
-                    container = node;
-                }
+            if (isBelongs) {
+                container = node;
             }
+            return isBelongs;
         }, this);
 
         // Create the `container` if it doesn't already exist.

diff --git a/build/widget-buttons/widget-buttons-min.js b/build/widget-buttons/widget-buttons-min.js
diff --git a/build/widget-buttons/widget-buttons.js b/build/widget-buttons/widget-buttons.js
@@ -606,16 +606,14 @@ WidgetButtons.prototype = {
         containerSelector = '.' + sectionClassName + ' .' + buttonsClassName;
 
         // Search only inside the current widget
-        contentBox.all(containerSelector).each(function(node, index) {
-            var widget;
+        contentBox.all(containerSelector).some(function(node){
+            var widget = Y.Widget.getByNode(node),
+                isBelongs = !widget || widget === this;
 
-            if (!container) {
-                widget = Y.Widget.getByNode(node);
-
-                if (!widget || widget === this) {
-                    container = node;
-                }
+            if (isBelongs) {
+                container = node;
             }
+            return isBelongs;
         }, this);
 
         // Create the `container` if it doesn't already exist.

diff --git a/src/widget-buttons/js/widget-buttons.js b/src/widget-buttons/js/widget-buttons.js
@@ -604,16 +604,14 @@ WidgetButtons.prototype = {
         containerSelector = '.' + sectionClassName + ' .' + buttonsClassName;
 
         // Search only inside the current widget
-        contentBox.all(containerSelector).each(function(node, index) {
-            var widget;
+        contentBox.all(containerSelector).some(function(node){
+            var widget = Y.Widget.getByNode(node),
+                isBelongs = !widget || widget === this;
 
-            if (!container) {
-                widget = Y.Widget.getByNode(node);
-
-                if (!widget || widget === this) {
-                    container = node;
-                }
+            if (isBelongs) {
+                container = node;
             }
+            return isBelongs;
         }, this);
 
         // Create the `container` if it doesn't already exist.