Skip to content

Instantly share code, notes, and snippets.

adcsugr:taskspeed dante$ git diff tests/qooxdoo-tests.js
diff --cc tests/qooxdoo-tests.js
index ae9c528,e4c003f..0000000
--- a/tests/qooxdoo-tests.js
+++ b/tests/qooxdoo-tests.js
@@@ -58,8 -58,7 +58,12 @@@ window.tests =
for (var i=0; i<40; i++)
{
++<<<<<<< HEAD
<!DOCTYPE html>
<html>
<head>
<style type="text/css">
#content-area { width:500px; padding:10px; }
</style>
<script src="trunk/dojo/dojo.js">
// requires dojo 1.4
dojo.ready(function() {
/*
Emulate IE-6 rendering
original: http://mankzblog.wordpress.com/2009/11/13/ie6-frame-to-battle-chrome-frame/
@param node, the poor node to get "the treatment"
*/
// dear LORD, please DRY
// d.global == window, d.doc == document
// dojo.selection function defition (one-time cost to determine):
var _selection = "getSelection",
selection = d.global[_selection] || d.doc[_selection] || function(){
return d.doc.selection.createRange().text || "";
}
;
(function(d){
d.compose = function(/* Function... */){
// summary: Returns the composition of a list of functions.
//
// description:
// Returns the composition of a list of functions, where each
// function consumes the return value of the function that follows.
//
// additionally, if one of the functions returns an array, the values
dojo.require("dojo.string");
(function(d){
var _eraseFrom = function(ar, handle, cb){
dojo.forEach(ar, function(item, index){
if(handle == item){
cb(item);
ar.splice(index, 0);
}
});
// Excerpt from http://www.mtv.com/sitewide/scripts/reporting/mtvi_reporting.js
/*Build Date: Fri May 15, 2009 14:20:51*/
try {
var com = typeof com === 'object' ? com : {};
com.mtvi = typeof com.mtvi === 'object' ? com.mtvi : {};
com.mtvi.util = typeof com.mtvi.util === 'object' ? com.mtvi.util : {};
com.mtvi.logger = typeof com.mtvi.logger === 'object' ? com.mtvi.logger : {};
com.mtvi.config = typeof com.mtvi.config === 'object' ? com.mtvi.config : {};
com.mtvi.ads = typeof com.mtvi.ads === 'object' ? com.mtvi.ads : {};
[2:34p] phiggins: paul_irish: so what
[2:34p] JohnResig: nlogax: V8 == delorean
[2:34p] phiggins: 's the significance between 1.3.3 and 1.4? jq puts enhancements in the dot releases? Oh there's JohnResig
[2:35p] ben_alman: lol
[2:35p] JohnResig: phiggins: API changes in major releases
[2:35p] nlogax: JohnResig: omg! so that's why my computer is suddenly using 1.21 jiggawatts
[2:35p] phiggins: so like back-compat changes?
[2:35p] JohnResig: phiggins: yep
[2:35p] miketaylr: once you hit 88 back clicks....
[2:35p] phiggins: interesting. so no forward support for 1.3.x users, they have to take the regressions
[2:34p] phiggins: paul_irish: so what
[2:34p] JohnResig: nlogax: V8 == delorean
[2:34p] phiggins: 's the significance between 1.3.3 and 1.4? jq puts enhancements in the dot releases? Oh there's JohnResig
[2:35p] ben_alman: lol
[2:35p] JohnResig: phiggins: API changes in major releases
[2:35p] nlogax: JohnResig: omg! so that's why my computer is suddenly using 1.21 jiggawatts
[2:35p] phiggins: so like back-compat changes?
[2:35p] JohnResig: phiggins: yep
[2:35p] miketaylr: once you hit 88 back clicks....
[2:35p] phiggins: interesting. so no forward support for 1.3.x users, they have to take the regressions
dojo.declare('hitpost.Search', dijit._Widget, {
// not necessary:
// searchTimeout : null,
cache : {}, // NOTE: thisis a shared member, like a static. create it in postCreate
// if you want a unique cache for each instance. Otherwise, thisis fine.
// no need for a blank constructor
// constructor : function(args) { },