http://trac.tiddlywiki.org/changeset/9550
FND
2009-04-21 15:05:43 +0000 (Tue, 21 Apr 2009)
119
reverted use of "jq" as alias for jQuery
this reverts changes from changeset:9493 and changeset:9522
cf. ticket #1032
---------------
U Trunk/core/deprecated/Crypto.js
U Trunk/core/deprecated/FileSystem.js
U Trunk/core/deprecated/Http.js
U Trunk/core/js/Backstage.js
U Trunk/core/js/Dom.js
U Trunk/core/js/Http.js
U Trunk/core/js/Macros.js
U Trunk/core/js/Refresh.js
U Trunk/core/js/TiddlyWiki.js
U Trunk/core/js/Toolbar.js
U Trunk/core/js/main.js
---------------
Modified: Trunk/core/deprecated/Crypto.js
===================================================================
--- Trunk/core/deprecated/Crypto.js 2009-04-21 14:17:04 UTC (rev 9549)
+++ Trunk/core/deprecated/Crypto.js 2009-04-21 15:05:43 UTC (rev 9550)
@@ -9,36 +9,36 @@
// Convert a string to an array of big-endian 32-bit words
Crypto.strToBe32s = function(str)
{
- return jq.encoding.strToBe32s(str);
+ return jQuery.encoding.strToBe32s(str);
};
// Convert an array of big-endian 32-bit words to a string
Crypto.be32sToStr = function(be)
{
- return jq.encoding.be32sToStr(be);
+ return jQuery.encoding.be32sToStr(be);
};
// Convert an array of big-endian 32-bit words to a hex string
Crypto.be32sToHex = function(be)
{
- return jq.encoding.be32sToHex(be);
+ return jQuery.encoding.be32sToHex(be);
};
// Return, in hex, the SHA-1 hash of a string
Crypto.hexSha1Str = function(str)
{
- return jq.encoding.digests.hexSha1Str(str);
+ return jQuery.encoding.digests.hexSha1Str(str);
};
// Return the SHA-1 hash of a string
Crypto.sha1Str = function(str)
{
- return jq.encoding.digests.sha1Str(str);
+ return jQuery.encoding.digests.sha1Str(str);
};
// Calculate the SHA-1 hash of an array of blen bytes of big-endian 32-bit
words
Crypto.sha1 = function(x,blen)
{
- return jq.encoding.digests.sha1(x,blen);
+ return jQuery.encoding.digests.sha1(x,blen);
};
Modified: Trunk/core/deprecated/FileSystem.js
===================================================================
--- Trunk/core/deprecated/FileSystem.js 2009-04-21 14:17:04 UTC (rev 9549)
+++ Trunk/core/deprecated/FileSystem.js 2009-04-21 15:05:43 UTC (rev 9550)
@@ -5,16 +5,16 @@
function saveFile(filePath,content)
{
- return jq.file.save(filePath,content);
+ return jQuery.file.save(filePath,content);
}
function loadFile(filePath)
{
- return jq.file.load(filePath);
+ return jQuery.file.load(filePath);
}
function copyFile(dest,source)
{
- return jq.file.copy(dest,source);
+ return jQuery.file.copy(dest,source);
}
Modified: Trunk/core/deprecated/Http.js
===================================================================
--- Trunk/core/deprecated/Http.js 2009-04-21 14:17:04 UTC (rev 9549)
+++ Trunk/core/deprecated/Http.js 2009-04-21 15:05:43 UTC (rev 9550)
@@ -60,7 +60,7 @@
if(callback) {
options.complete = function(xhr,textStatus) {
- if(jq.httpSuccess(xhr))
+ if(jQuery.httpSuccess(xhr))
callback(true,params,xhr.responseText,url,xhr);
else
callback(false,params,null,url,xhr);
@@ -74,6 +74,6 @@
options.password = password;
if(window.Components && window.netscape && window.netscape.security &&
document.location.protocol.indexOf("http") == -1)
window.netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
- jq.ajax(options);
+ jQuery.ajax(options);
}
Modified: Trunk/core/js/Backstage.js
===================================================================
--- Trunk/core/js/Backstage.js 2009-04-21 14:17:04 UTC (rev 9549)
+++ Trunk/core/js/Backstage.js 2009-04-21 15:05:43 UTC (rev 9550)
@@ -63,8 +63,8 @@
} else {
backstage.area.style.left = "0px";
}
- jq(this.showButton).hide();
- jq(this.hideButton).show();
+ jQuery(this.showButton).hide();
+ jQuery(this.hideButton).show();
config.options.chkBackstage = true;
saveOptionCookie("chkBackstage");
addClass(this.content,"backstageVisible");
@@ -171,7 +171,7 @@
var c = function(element,properties)
{backstage.cloak.style.display = "none";};
anim.startAnimating(new
Morpher(backstage.panel,config.animDuration,p,c));
} else {
- jq([backstage.panel,backstage.cloak]).hide();
+ jQuery([backstage.panel,backstage.cloak]).hide();
}
}
};
Modified: Trunk/core/js/Dom.js
===================================================================
--- Trunk/core/js/Dom.js 2009-04-21 14:17:04 UTC (rev 9549)
+++ Trunk/core/js/Dom.js 2009-04-21 15:05:43 UTC (rev 9550)
@@ -323,39 +323,39 @@
function addClass(e,className)
{
- jq(e).addClass(className);
+ jQuery(e).addClass(className);
}
function removeClass(e,className)
{
- jq(e).removeClass(className);
+ jQuery(e).removeClass(className);
}
function hasClass(e,className)
{
- return jq(e).hasClass(className);
+ return jQuery(e).hasClass(className);
}
// Remove all children of a node
function removeChildren(e)
{
- jq(e).empty();
+ jQuery(e).empty();
}
function createTiddlyText(parent,text)
{
- return jq(parent).append(text);
+ return jQuery(parent).append(text);
}
// Return the content of an element as plain text with no formatting
function getPlainText(e)
{
- return jq(e).text();
+ return jQuery(e).text();
}
// Remove a node and all it's children
function removeNode(e)
{
- jq(e).remove();
+ jQuery(e).remove();
}
Modified: Trunk/core/js/Http.js
===================================================================
--- Trunk/core/js/Http.js 2009-04-21 14:17:04 UTC (rev 9549)
+++ Trunk/core/js/Http.js 2009-04-21 15:05:43 UTC (rev 9550)
@@ -7,6 +7,6 @@
{
if(window.Components && window.netscape && window.netscape.security &&
document.location.protocol.indexOf("http") == -1)
window.netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
- return jq.ajax(args);
+ return jQuery.ajax(args);
}
Modified: Trunk/core/js/Macros.js
===================================================================
--- Trunk/core/js/Macros.js 2009-04-21 14:17:04 UTC (rev 9549)
+++ Trunk/core/js/Macros.js 2009-04-21 15:05:43 UTC (rev 9550)
@@ -6,12 +6,12 @@
{
var now = new Date();
var text = params[0] ? now.formatString(params[0].trim()) :
now.toLocaleString();
- jq("<span/>").text(text).appendTo(place);
+ jQuery("<span/>").text(text).appendTo(place);
};
config.macros.version.handler = function(place)
{
- jq("<span/>").text(formatVersion()).appendTo(place);
+ jQuery("<span/>").text(formatVersion()).appendTo(place);
};
config.macros.list.handler = function(place,macroName,params)
@@ -387,7 +387,7 @@
var popup = Popup.create(this);
var tags = store.getTags(this.getAttribute("tags"));
if(tags.length == 0)
- jq("<li/>").text(lingo.popupNone).appendTo(jq(popup));
+ jQuery("<li/>").text(lingo.popupNone).appendTo(jQuery(popup));
for(var t=0; t<tags.length; t++) {
var tag =
createTiddlyButton(createTiddlyElement(popup,"li"),tags[t][0],lingo.tagTooltip.format([tags[t][0]]),config.macros.tagChooser.onTagClick);
tag.setAttribute("tag",tags[t][0]);
Modified: Trunk/core/js/Refresh.js
===================================================================
--- Trunk/core/js/Refresh.js 2009-04-21 14:17:04 UTC (rev 9549)
+++ Trunk/core/js/Refresh.js 2009-04-21 15:05:43 UTC (rev 9550)
@@ -110,7 +110,7 @@
function refreshPageTemplate(title)
{
- var stash = jq("<div/>").appendTo("body").hide()[0];
+ var stash = jQuery("<div/>").appendTo("body").hide()[0];
var display = story.getContainer();
var nodes,t;
if(display) {
Modified: Trunk/core/js/TiddlyWiki.js
===================================================================
--- Trunk/core/js/TiddlyWiki.js 2009-04-21 14:17:04 UTC (rev 9549)
+++ Trunk/core/js/TiddlyWiki.js 2009-04-21 15:05:43 UTC (rev 9550)
@@ -379,7 +379,7 @@
for(var i = 0;i<tiddlers.length; i++)
tiddlers[i].changed();
}
- jq().trigger("loadTiddlers");
+ jQuery().trigger("loadTiddlers");
};
// Load contents of a TiddlyWiki from a string
Modified: Trunk/core/js/Toolbar.js
===================================================================
--- Trunk/core/js/Toolbar.js 2009-04-21 14:17:04 UTC (rev 9549)
+++ Trunk/core/js/Toolbar.js 2009-04-21 15:05:43 UTC (rev 9550)
@@ -36,7 +36,7 @@
btn.setAttribute("commandName",commandName);
btn.setAttribute("tiddler",tiddler.title);
if(className)
- jq(btn).addClass(className);
+ jQuery(btn).addClass(className);
place.appendChild(btn);
}
}
@@ -128,11 +128,11 @@
break;
case "<":
var btn =
createTiddlyButton(place,this.lessLabel,this.lessPrompt,config.macros.toolbar.onClickLess);
- jq(btn).addClass("lessCommand");
+ jQuery(btn).addClass("lessCommand");
break;
case ">":
var btn =
createTiddlyButton(place,this.moreLabel,this.morePrompt,config.macros.toolbar.onClickMore);
- jq(btn).addClass("moreCommand");
+ jQuery(btn).addClass("moreCommand");
var e =
createTiddlyElement(place,"span",null,"moreCommand");
e.style.display = "none";
place = e;
Modified: Trunk/core/js/main.js
===================================================================
--- Trunk/core/js/main.js 2009-04-21 14:17:04 UTC (rev 9549)
+++ Trunk/core/js/main.js 2009-04-21 15:05:43 UTC (rev 9550)
@@ -24,7 +24,7 @@
{
var t10,t9,t8,t7,t6,t5,t4,t3,t2,t1,t0 = new Date();
startingUp = true;
- jq = jQuery.noConflict(); // Note: omission of var is deliberate, jq is
a global variable
+ jQuery.noConflict();
window.onbeforeunload = function(e) {if(window.confirmExit) return
confirmExit();};
params = getParameters();
if(params)
@@ -39,16 +39,16 @@
store.addNotification(config.notifyTiddlers[s].name,config.notifyTiddlers[s].notify);
t1 = new Date();
loadShadowTiddlers();
- jq().trigger("loadShadows");
+ jQuery().trigger("loadShadows");
t2 = new Date();
store.loadFromDiv("storeArea","store",true);
- jq().trigger("loadTiddlers");
+ jQuery().trigger("loadTiddlers");
t3 = new Date();
invokeParamifier(params,"onload");
t4 = new Date();
readOnly = (window.location.protocol == "file:") ? false :
config.options.chkHttpReadOnly;
var pluginProblem = loadPlugins();
- jq().trigger("loadPlugins");
+ jQuery().trigger("loadPlugins");
t5 = new Date();
formatter = new Formatter(config.formatters);
invokeParamifier(params,"onconfig");
@@ -82,7 +82,7 @@
displayMessage("Total: " + (t10-t0) + " ms");
}
startingUp = false;
- jq().trigger("startup");
+ jQuery().trigger("startup");
}
// Called on unload. All functions called conditionally since they themselves
may have been unloaded.
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"TiddlyWikiDev" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/TiddlyWikiDev?hl=en
-~----------~----~----~----~------~----~------~--~---
