upgrade Dojo to 1.6.1

[tt-rss.git] / lib / dijit / Toolbar.js

diff --git a/lib/dijit/Toolbar.js b/lib/dijit/Toolbar.js
index e51f7eaf8c652ffeb1ce9b03b14ee23a41353937..94184f989c582f799465c275680899d88bf9aafc 100644 (file)
--- a/lib/dijit/Toolbar.js
+++ b/lib/dijit/Toolbar.js
@@ -1,25 +1,53 @@
 /*
-       Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
+       Copyright (c) 2004-2011, The Dojo Foundation All Rights Reserved.
        Available via Academic Free License >= 2.1 OR the modified BSD license.
        see: http://dojotoolkit.org/license for details
 */
 
 
-if(!dojo._hasResource["dijit.Toolbar"]){
-dojo._hasResource["dijit.Toolbar"]=true;
+if(!dojo._hasResource["dijit.Toolbar"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code.
+dojo._hasResource["dijit.Toolbar"] = true;
 dojo.provide("dijit.Toolbar");
 dojo.require("dijit._Widget");
 dojo.require("dijit._KeyNavContainer");
 dojo.require("dijit._Templated");
-dojo.declare("dijit.Toolbar",[dijit._Widget,dijit._Templated,dijit._KeyNavContainer],{templateString:"<div class=\"dijit\" waiRole=\"toolbar\" tabIndex=\"${tabIndex}\" dojoAttachPoint=\"containerNode\">"+"</div>",baseClass:"dijitToolbar",postCreate:function(){
-this.connectKeyNavHandlers(this.isLeftToRight()?[dojo.keys.LEFT_ARROW]:[dojo.keys.RIGHT_ARROW],this.isLeftToRight()?[dojo.keys.RIGHT_ARROW]:[dojo.keys.LEFT_ARROW]);
-this.inherited(arguments);
-},startup:function(){
-if(this._started){
-return;
-}
-this.startupKeyNavChildren();
-this.inherited(arguments);
-}});
 dojo.require("dijit.ToolbarSeparator");
+
+
+// Note: require of ToolbarSeparator is for back-compat, remove for 2.0
+
+dojo.declare("dijit.Toolbar",
+       [dijit._Widget, dijit._Templated, dijit._KeyNavContainer],
+       {
+       // summary:
+       //              A Toolbar widget, used to hold things like `dijit.Editor` buttons
+
+       templateString:
+               '<div class="dijit" role="toolbar" tabIndex="${tabIndex}" dojoAttachPoint="containerNode">' +
+               //      '<table style="table-layout: fixed" class="dijitReset dijitToolbarTable">' + // factor out style
+               //              '<tr class="dijitReset" dojoAttachPoint="containerNode"></tr>'+
+               //      '</table>' +
+               '</div>',
+
+       baseClass: "dijitToolbar",
+
+       postCreate: function(){
+               this.inherited(arguments);
+
+               this.connectKeyNavHandlers(
+                       this.isLeftToRight() ? [dojo.keys.LEFT_ARROW] : [dojo.keys.RIGHT_ARROW],
+                       this.isLeftToRight() ? [dojo.keys.RIGHT_ARROW] : [dojo.keys.LEFT_ARROW]
+               );
+       },
+
+       startup: function(){
+               if(this._started){ return; }
+
+               this.startupKeyNavChildren();
+
+               this.inherited(arguments);
+       }
+}
+);
+
 }