Update OOjs UI to v0.1.0-pre (3b434d5388)
authorJames D. Forrester <jforrester@wikimedia.org>
Fri, 21 Mar 2014 18:06:33 +0000 (11:06 -0700)
committerJames D. Forrester <jforrester@wikimedia.org>
Fri, 21 Mar 2014 18:07:00 +0000 (11:07 -0700)
New changes:
076b85e Split autoAdd into catchall and group specific settings

Change-Id: Idb99c0af20f966ead553c7a7eded421ad8b44382

resources/oojs-ui/oojs-ui.js
resources/oojs-ui/oojs-ui.svg.css

index 62453ea..8f3d980 100644 (file)
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (0f50cdc46c)
+ * OOjs UI v0.1.0-pre (3b434d5388)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: Wed Mar 19 2014 17:39:11 GMT-0700 (PDT)
+ * Date: Fri Mar 21 2014 11:06:28 GMT-0700 (PDT)
  */
 ( function () {
 
@@ -2774,13 +2774,22 @@ OO.ui.Tool.static.group = '';
 OO.ui.Tool.static.title = '';
 
 /**
- * Tool can be automatically added to tool groups.
+ * Tool can be automatically added to catch-all groups.
  *
  * @static
  * @property {boolean}
  * @inheritable
  */
-OO.ui.Tool.static.autoAdd = true;
+OO.ui.Tool.static.autoAddToCatchall = true;
+
+/**
+ * Tool can be automatically added to named groups.
+ *
+ * @static
+ * @property {boolean}
+ * @inheritable
+ */
+OO.ui.Tool.static.autoAddToGroup = true;
 
 /**
  * Check if this tool is compatible with given data.
@@ -3181,7 +3190,7 @@ OO.ui.ToolFactory.prototype.extract = function ( collection, used ) {
                        tool = this.registry[name];
                        if (
                                // Only add tools by group name when auto-add is enabled
-                               tool.static.autoAdd &&
+                               tool.static.autoAddToCatchall &&
                                // Exclude already used tools
                                ( !used || !used[name] )
                        ) {
@@ -3206,7 +3215,7 @@ OO.ui.ToolFactory.prototype.extract = function ( collection, used ) {
                                                        // Include tools with matching group
                                                        tool.static.group === item.group &&
                                                        // Only add tools by group name when auto-add is enabled
-                                                       tool.static.autoAdd &&
+                                                       tool.static.autoAddToGroup &&
                                                        // Exclude already used tools
                                                        ( !used || !used[name] )
                                                ) {
index f34fc32..dbce03d 100644 (file)
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (0f50cdc46c)
+ * OOjs UI v0.1.0-pre (3b434d5388)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: Wed Mar 19 2014 17:39:11 GMT-0700 (PDT)
+ * Date: Fri Mar 21 2014 11:06:28 GMT-0700 (PDT)
  */
 
 /* Textures */