From d90f2d0b0b956a15f4de67f47616fad705d570b8 Mon Sep 17 00:00:00 2001 From: Steve Hickey Date: Tue, 26 Jun 2012 18:09:43 -0400 Subject: [PATCH] Fix critical spelling error --- README.md | 2 +- fuckit-min.js | 2 +- fuckit.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5a83db7..f1344f8 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ FuckIt returns a promise that will be resolved once your godforsaken code actual Are you using two different FuckIt libraries? Fuck it, use FuckIt.NoConflict. Of course, this won't really help since FuckItJS reloads itself multiple times and will continually overwrite the global FuckIt variable, but hey... at least you can feel like you're doing something smart. -**FuckIt.moreConflict**() +**FuckIt.moarConflict**() Are you tired of running from conflict? Are you ready to overwrite every single property on the global `window` object even if it crashes your browser? Then this method is for you. diff --git a/fuckit-min.js b/fuckit-min.js index dcf2d57..756ee29 100644 --- a/fuckit-min.js +++ b/fuckit-min.js @@ -5,4 +5,4 @@ Note: This is ALPHA software and may result in irreversible brain damage. */ -(function($){$.ajaxSetup({cache:true});var _FuckIt=window.FuckIt;var FuckIt=function(script){var req=$.ajax({url:script,dataType:"text"});req.then(function(result){window.fuckedScript=result;eval(window.fuckedScript);},function(){throw new Error("Could not load script: "+script);});};window.onerror=function(error,url,line){if(!window.fuckedScript)return;var parsed=window.fuckedScript.split("\n");parsed.splice(line-1,1);window.fuckedScript=parsed.join("\n");$.getScript("fuckit.js",function(){eval(window.fuckedScript);});return true;};FuckIt.noConflict=function(){window.FuckIt=_FuckIt;return FuckIt;};window.FuckIt=FuckIt;})(jQuery); \ No newline at end of file +(function($){$.ajaxSetup({cache:true});var _FuckIt=window.FuckIt;var FuckIt=function(script){window.fuckingDeferred=$.Deferred();$.ajax({url:script,dataType:"text"}).then(function(result){window.fuckedScript=result;eval(window.fuckedScript);window.fuckingDeferred.resolve()},function(){throw new Error("Could not load script: "+script)});return window.fuckingDeferred.promise()};window.onerror=function(error,url,line){if(!window.fuckedScript)return;var parsed=window.fuckedScript.split("\n");parsed.splice(line-1,1);window.fuckedScript=parsed.join("\n");$.getScript("fuckit.js",function(){eval(window.fuckedScript);window.fuckingDeferred.resolve()});return true};FuckIt.noConflict=function(){window.FuckIt=_FuckIt;return FuckIt};FuckIt.moarConflict=function(){for(var a in window){if(a==="location"){continue}window[a]=FuckIt}};window.FuckIt=FuckIt})(jQuery); \ No newline at end of file diff --git a/fuckit.js b/fuckit.js index 3717406..2377820 100644 --- a/fuckit.js +++ b/fuckit.js @@ -46,7 +46,7 @@ return FuckIt; } - FuckIt.moreConflict = function(){ + FuckIt.moarConflict = function(){ for (var prop in window){ if (prop === "location"){ //you're not getting away that easy.