From 81bea17aefb26859f825b9293c7c99192874806e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 8 Nov 2011 20:40:44 +0400 Subject: upgrade Dojo to 1.6.1 --- lib/dojo/_firebug/firebug.js | 108 +++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 54 deletions(-) (limited to 'lib/dojo/_firebug') diff --git a/lib/dojo/_firebug/firebug.js b/lib/dojo/_firebug/firebug.js index d1f112f69..c78b50fa6 100644 --- a/lib/dojo/_firebug/firebug.js +++ b/lib/dojo/_firebug/firebug.js @@ -1,5 +1,5 @@ /* - 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 */ @@ -8,13 +8,14 @@ if(!dojo._hasResource["dojo._firebug.firebug"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. dojo._hasResource["dojo._firebug.firebug"] = true; dojo.provide("dojo._firebug.firebug"); + dojo.deprecated = function(/*String*/ behaviour, /*String?*/ extra, /*String?*/ removal){ - // summary: + // summary: // Log a debug message to indicate that a behavior has been // deprecated. // extra: Text to append to the message. - // removal: + // removal: // Text to indicate when in the future the behavior will be removed. var message = "DEPRECATED: " + behaviour; if(extra){ message += " " + extra; } @@ -24,16 +25,16 @@ dojo.deprecated = function(/*String*/ behaviour, /*String?*/ extra, /*String?*/ dojo.experimental = function(/* String */ moduleName, /* String? */ extra){ // summary: Marks code as experimental. - // description: + // description: // This can be used to mark a function, file, or module as // experimental. Experimental code is not ready to be used, and the // APIs are subject to change without notice. Experimental code may be // completed deleted without going through the normal deprecation // process. - // moduleName: + // moduleName: // The name of a module, or the name of a module file or a specific // function - // extra: + // extra: // some additional message for the user // example: // | dojo.experimental("dojo.data.Result"); @@ -49,10 +50,10 @@ dojo.experimental = function(/* String */ moduleName, /* String? */ extra){ // description: // Opens a console for logging, debugging, and error messages. // Contains partial functionality to Firebug. See function list below. - // NOTE: + // NOTE: // Firebug is a Firefox extension created by Joe Hewitt (see license). You do not need Dojo to run Firebug. // Firebug Lite is included in Dojo by permission from Joe Hewitt - // If you are new to Firebug, or used to the Dojo 0.4 dojo.debug, you can learn Firebug + // If you are new to Firebug, or used to the Dojo 0.4 dojo.debug, you can learn Firebug // functionality by reading the function comments below or visiting http://www.getfirebug.com/docs.html // NOTE: // To test Firebug Lite in Firefox: @@ -80,13 +81,13 @@ dojo.experimental = function(/* String */ moduleName, /* String? */ extra){ var calls = ["log", "info", "debug", "warn", "error"]; for(var i=0;i'+label+''; }; - consoleFrame.innerHTML = + consoleFrame.innerHTML = '
' + '
    ' @@ -598,8 +599,8 @@ dojo.experimental = function(/* String */ moduleName, /* String? */ extra){ function layout(h){ var tHeight = 25; //consoleToolbar.offsetHeight; // tab style not ready on load - throws off layout - var height = h ? - h - (tHeight + commandLine.offsetHeight +25 + (h*.01)) + "px" : + var height = h ? + h - (tHeight + commandLine.offsetHeight +25 + (h*.01)) + "px" : (consoleFrame.offsetHeight - tHeight - commandLine.offsetHeight) + "px"; consoleBody.style.top = tHeight + "px"; @@ -610,7 +611,7 @@ dojo.experimental = function(/* String */ moduleName, /* String? */ extra){ consoleDomInspector.style.top = tHeight + "px"; commandLine.style.bottom = 0; - dojo.addOnWindowUnload(clearFrame) + dojo.addOnWindowUnload(clearFrame); } function logRow(message, className, handler){ @@ -755,7 +756,7 @@ dojo.experimental = function(/* String */ moduleName, /* String? */ extra){ function parseFormat(format){ var parts = []; - var reg = /((^%|[^\\]%)(\d+)?(\.)([a-zA-Z]))|((^%|[^\\]%)([a-zA-Z]))/; + var reg = /((^%|[^\\]%)(\d+)?(\.)([a-zA-Z]))|((^%|[^\\]%)([a-zA-Z]))/; var appenderMap = {s: appendText, d: appendInteger, i: appendInteger, f: appendFloat}; for(var m = reg.exec(format); m; m = reg.exec(format)){ @@ -900,7 +901,7 @@ dojo.experimental = function(/* String */ moduleName, /* String? */ extra){ appendNode(child, html); } - html.push('
</', + html.push('
</', node.nodeName.toLowerCase(), '>
'); }else{ html.push('/>'); @@ -933,7 +934,7 @@ dojo.experimental = function(/* String */ moduleName, /* String? */ extra){ if(document.all){ event.cancelBubble = true; }else{ - event.stopPropagation(); + event.stopPropagation(); } } @@ -942,7 +943,7 @@ dojo.experimental = function(/* String */ moduleName, /* String? */ extra){ var fileName = lastSlash == -1 ? href : href.substr(lastSlash+1); var html = [ - '', msg, '', + '', msg, '', '' ]; @@ -965,7 +966,7 @@ dojo.experimental = function(/* String */ moduleName, /* String? */ extra){ toggleConsole(); }else if( (ekc == keys.NUMPAD_ENTER || ekc == 76) && - event.shiftKey && + event.shiftKey && (event.metaKey || event.ctrlKey) ){ focusCommandLine(); @@ -1072,7 +1073,7 @@ dojo.experimental = function(/* String */ moduleName, /* String? */ extra){ function objectLength(o){ var cnt = 0; for(var nm in o){ - cnt++ + cnt++; } return cnt; } @@ -1222,5 +1223,4 @@ dojo.experimental = function(/* String */ moduleName, /* String? */ extra){ })(); - } -- cgit v1.2.3