suzanne.soy/whalesong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correcting a few name collisions

Browse Source
This commit is contained in:
Danny Yoo 2013-03-29 18:01:33 -06:00
parent b2ac271d9c
commit 17ebfb5a4b
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
whalesong/image/private/kernel.js
View File

@ -133,9 +133,9 @@ var makeCanvas = function(width, height) {
canvas.width = width; canvas.width = width;
canvas.height = height; canvas.height = height;
$(canvas).css('width', canvas.width + "px"); jQuery(canvas).css('width', canvas.width + "px");
$(canvas).css('height', canvas.height + "px"); jQuery(canvas).css('height', canvas.height + "px");
$(canvas).css('padding', '0px'); jQuery(canvas).css('padding', '0px');
// KLUDGE: IE compatibility uses /js/excanvas.js, and dynamic // KLUDGE: IE compatibility uses /js/excanvas.js, and dynamic
// elements must be marked this way. // elements must be marked this way.
@ -185,14 +185,14 @@ BaseImage.prototype.toDomNode = function(params) {
// for calling this after the dom node is attached to the // for calling this after the dom node is attached to the
// document. // document.
var onAfterAttach = function(event) { var onAfterAttach = function(event) {
// $(canvas).unbind('afterAttach', onAfterAttach); // jQuery(canvas).unbind('afterAttach', onAfterAttach);
var ctx = this.getContext("2d"); var ctx = this.getContext("2d");
that.render(ctx, 0, 0); that.render(ctx, 0, 0);
}; };
$(canvas).bind('afterAttach', onAfterAttach); jQuery(canvas).bind('afterAttach', onAfterAttach);
// Canvases lose their drawn content on cloning. data may help us to preserve it. // Canvases lose their drawn content on cloning. data may help us to preserve it.
$(canvas).data('toRender', onAfterAttach); jQuery(canvas).data('toRender', onAfterAttach);
return canvas; return canvas;
}; };

4
whalesong/web-world/js-impl.js
View File

@ -1,6 +1,6 @@
/*jslint browser: true, unparam: true, vars: true, white: true, plusplus: true, maxerr: 50, indent: 4, forin: true */ /*jslint browser: true, unparam: true, vars: true, white: true, plusplus: true, maxerr: 50, indent: 4, forin: true */
/*global plt,MACHINE,$,EXPORTS,TreeCursor*/ /*global plt,MACHINE,$,EXPORTS,TreeCursor*/
(function() { (function($) {
"use strict"; "use strict";
@ -2286,4 +2286,4 @@
EXPORTS['EventHandler'] = EventHandler; EXPORTS['EventHandler'] = EventHandler;
EXPORTS['wrapFunction'] = wrapFunction; EXPORTS['wrapFunction'] = wrapFunction;
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
}()); }(jQuery));

4
whalesong/world/kernel.js
View File

@ -24,9 +24,9 @@ var finalizeClosureCall = plt.baselib.functions.finalizeClosureCall;
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
var bigBang = function(MACHINE, initW, handlers) { var bigBang = function(MACHINE, initW, handlers) {
var outerToplevelNode = $('<span/>').css('padding', '0px').get(0); var outerToplevelNode = jQuery('<span/>').css('padding', '0px').get(0);
MACHINE.params.currentOutputPort.writeDomNode(MACHINE, outerToplevelNode); MACHINE.params.currentOutputPort.writeDomNode(MACHINE, outerToplevelNode);
var toplevelNode = $('<span/>').css('padding', '0px').appendTo(outerToplevelNode).get(0); var toplevelNode = jQuery('<span/>').css('padding', '0px').appendTo(outerToplevelNode).get(0);
var configs = []; var configs = [];
var isOutputConfigSeen = false; var isOutputConfigSeen = false;

4
whalesong/world/raw-jsworld.js
View File

@ -731,8 +731,8 @@ var rawJsworld = {};
return { return {
onRegister: function(top) { onRegister: function(top) {
//http://www.w3.org/TR/html5/editing.html#sequential-focus-navigation-and-the-tabindex-attribue //http://www.w3.org/TR/html5/editing.html#sequential-focus-navigation-and-the-tabindex-attribue
$(top).attr('tabindex', 1); jQuery(top).attr('tabindex', 1);
$(top).focus(); jQuery(top).focus();
attachEvent(top, 'keydown', wrappedPress); attachEvent(top, 'keydown', wrappedPress);
}, },
onUnregister: function(top) { onUnregister: function(top) {