@@ -1,4 +1,4 @@ -Copyright (c) 2008, Paul Mucur, http://mucur.name +Copyright (c) 2008-2009, Paul Mucur, http://mucur.name All rights reserved. BSD-LICENSE.txt @@ -1,4 +1,4 @@ -jQuery Form Example Plugin 1.4.1 +jQuery Form Example Plugin 1.4.2 ====================================== This is a jQuery plugin to populate form inputs with example text that @@ -111,4 +111,4 @@ the Free Software Foundation; either version 2 of the License, or This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. \ No newline at end of file +GNU General Public License for more details. README.markdown @@ -1,5 +1,5 @@ /* - * jQuery Form Example Plugin 1.4.1 + * jQuery Form Example Plugin 1.4.2 * Populate form inputs with example text that disappears on focus. * * e.g. @@ -129,7 +129,14 @@ $(this).removeClass(o.className); } }); - + + /* Detect a change event to the field and remove the example class. */ + $this.change(function() { + if ($(this).is('.' + o.className)) { + $(this).removeClass(o.className); + } + }); + /* Make the example text reappear if the input is blank on blurring. */ $this.blur(function() { if ($(this).val() == '') { @@ -157,4 +164,4 @@ /* All the class names used are stored as keys in the following array. */ $.fn.example.boundClassNames = []; -})(jQuery); \ No newline at end of file +})(jQuery); jquery.example.js @@ -1,5 +1,5 @@ /* - * jQuery Form Example Plugin 1.4.1 + * jQuery Form Example Plugin 1.4.2 * Populate form inputs with example text that disappears on focus. * * e.g. @@ -25,4 +25,4 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -(function(A){A.fn.example=function(E,C){var D=A.isFunction(E);var B=A.extend({},C,{example:E});return this.each(function(){var F=A(this);if(A.metadata){var G=A.extend({},A.fn.example.defaults,F.metadata(),B)}else{var G=A.extend({},A.fn.example.defaults,B)}if(!A.fn.example.boundClassNames[G.className]){A(window).unload(function(){A("."+G.className).val("")});A("form").submit(function(){A(this).find("."+G.className).val("")});A.fn.example.boundClassNames[G.className]=true}if(A.browser.msie&&!F.attr("defaultValue")&&(D||F.val()==G.example)){F.val("")}if(F.val()==""&&this!=document.activeElement){F.addClass(G.className);F.val(D?G.example.call(this):G.example)}F.focus(function(){if(A(this).is("."+G.className)){A(this).val("");A(this).removeClass(G.className)}});F.blur(function(){if(A(this).val()==""){A(this).addClass(G.className);A(this).val(D?G.example.call(this):G.example)}})})};A.fn.example.defaults={className:"example"};A.fn.example.boundClassNames=[]})(jQuery); \ No newline at end of file +(function(a){a.fn.example=function(e,c){var d=a.isFunction(e);var b=a.extend({},c,{example:e});return this.each(function(){var f=a(this);if(a.metadata){var g=a.extend({},a.fn.example.defaults,f.metadata(),b)}else{var g=a.extend({},a.fn.example.defaults,b)}if(!a.fn.example.boundClassNames[g.className]){a(window).unload(function(){a("."+g.className).val("")});a("form").submit(function(){a(this).find("."+g.className).val("")});a.fn.example.boundClassNames[g.className]=true}if(a.browser.msie&&!f.attr("defaultValue")&&(d||f.val()==g.example)){f.val("")}if(f.val()==""&&this!=document.activeElement){f.addClass(g.className);f.val(d?g.example.call(this):g.example)}f.focus(function(){if(a(this).is("."+g.className)){a(this).val("");a(this).removeClass(g.className)}});f.change(function(){if(a(this).is("."+g.className)){a(this).removeClass(g.className)}});f.blur(function(){if(a(this).val()==""){a(this).addClass(g.className);a(this).val(d?g.example.call(this):g.example)}})})};a.fn.example.defaults={className:"example"};a.fn.example.boundClassNames=[]})(jQuery); jquery.example.min.js @@ -17,7 +17,7 @@ <script type="text/javascript" src="jquery.js"></script> <script type="text/javascript" src="metadata.js"></script> - + <!-- Include the library twice. --> <script type="text/javascript" src="../jquery.example.js"></script> <script type="text/javascript" src="../jquery.example.js"></script> @@ -199,6 +199,21 @@ equals($('#m2').val(), "Precedence", "The example in the arguments should take precedence"); ok($('#m2').hasClass('o1'), "The class should be 'o1'."); }); + + module("Changing values by Javascript"); + test("should set example", function() { + $('#f1').example('Example'); + + equals($('#f1').val(), "Example", "The example should read 'Example'."); + ok($('#f1').hasClass('example'), "The example class should be set."); + }); + test("should remove example class when changed", function() { + $('#f1').val("New value"); + $('#f1').change(); + + equals($('#f1').val(), "New value", "Value should be changed to 'New value'."); + ok(!$('#f1').hasClass('example'), "The example class should no longer be set."); + }); </script> <div id="inputs"> <form id="basicform"> @@ -222,6 +237,9 @@ <p><input type="text" id="m1" class="{example: 'Something', className: 'm1'}"></p> <p><input type="text" id="m2" class="{example: 'Override', className: 'm2'}"></p> </form> + <form id="no_focus"> + <p><input type="text" id="f1"></p> + </form> </div> </body> -</html> \ No newline at end of file +</html> test/index.html @@ -7,7 +7,7 @@ * Dual licensed under the MIT (MIT-LICENSE.txt) * and GPL (GPL-LICENSE.txt) licenses. * - * $Id: testrunner.js 6133 2009-01-19 22:38:58Z jeresig $ + * $Id: testrunner.js 6173 2009-02-02 20:09:32Z jeresig $ */ (function($) { @@ -232,7 +232,10 @@ $.extend(window, { push(equiv(a, b), a, b, message); }, QUnit: { - equiv: equiv + equiv: equiv, + ok: ok, + done: function(failures, total){}, + log: function(result, message){} }, // legacy methods below isSet: isSet, @@ -254,10 +257,14 @@ $.extend(window, { $(window).load(function() { $('#userAgent').html(navigator.userAgent); - var head = $('<div class="testrunner-toolbar"><label for="filter">Hide passed tests</label></div>').insertAfter("#userAgent"); - $('<input type="checkbox" id="filter" />').attr("disabled", true).prependTo(head).click(function() { + var head = $('<div class="testrunner-toolbar"><label for="filter-pass">Hide passed tests</label></div>').insertAfter("#userAgent"); + $('<input type="checkbox" id="filter-pass" />').attr("disabled", true).prependTo(head).click(function() { $('li.pass')[this.checked ? 'hide' : 'show'](); }); + $('<input type="checkbox" id="filter-missing">').attr("disabled", true).appendTo(head).click(function() { + $("li.fail:contains('missing test - untested code is broken code')").parent('ol').parent('li.fail')[this.checked ? 'hide' : 'show'](); + }); + $("#filter-missing").after('<label for="filter-missing">Hide missing tests (untested code is broken code)</label>'); runTest(); }); @@ -278,7 +285,7 @@ function stop(timeout) { config.blocking = true; if (timeout) config.timeout = setTimeout(function() { - ok( false, "Test timed out" ); + QUnit.ok( false, "Test timed out" ); start(); }, timeout); } @@ -324,6 +331,7 @@ function runTest() { .join('')) .appendTo("body"); $("#banner").addClass(config.stats.bad ? "fail" : "pass"); + QUnit.done( config.stats.bad, config.stats.all ); }); } @@ -371,10 +379,7 @@ function test(name, callback) { saveGlobal(); lifecycle.setup(); } catch(e) { - config.assertions.push( { - result: false, - message: "Setup failed on " + name + ": " + e.message - }); + QUnit.ok( false, "Setup failed on " + name + ": " + e.message ); } }) synchronize(function() { @@ -386,10 +391,7 @@ function test(name, callback) { console.error(e); console.warn(callback.toString()); } - config.assertions.push( { - result: false, - message: "Died on test #" + (config.assertions.length + 1) + ": " + e.message - }); + QUnit.ok( false, "Died on test #" + (config.assertions.length + 1) + ": " + e.message ); // else next test will carry the responsibility saveGlobal(); } @@ -399,10 +401,7 @@ function test(name, callback) { checkPollution(); lifecycle.teardown(); } catch(e) { - config.assertions.push( { - result: false, - message: "Teardown failed on " + name + ": " + e.message - }); + QUnit.ok( false, "Teardown failed on " + name + ": " + e.message ); } }) synchronize(function() { @@ -417,10 +416,7 @@ function test(name, callback) { } if(config.expected && config.expected != config.assertions.length) { - config.assertions.push({ - result: false, - message: "Expected " + config.expected + " assertions, but " + config.assertions.length + " were run" - }); + QUnit.ok( false, "Expected " + config.expected + " assertions, but " + config.assertions.length + " were run" ); } var good = 0, bad = 0; @@ -448,7 +444,8 @@ function test(name, callback) { $("<li/>").addClass(bad ? "fail" : "pass").append(b).append(ol).appendTo("#tests"); if(bad) { - $("#filter").attr("disabled", null); + $("#filter-pass").attr("disabled", null); + $("#filter-missing").attr("disabled", null); } }); } @@ -480,6 +477,8 @@ function reset() { * @example ok( $("a").size() > 5, "There must be at least 5 anchors" ); */ function ok(a, msg) { + QUnit.log(a, msg); + config.assertions.push({ result: !!a, message: msg @@ -514,10 +513,7 @@ function isSet(a, b, msg) { ret = false; } else ret = false; - config.assertions.push({ - result: ret, - message: !ret ? (msg + " expected: " + serialArray(b) + " result: " + serialArray(a)) : msg - }); + QUnit.ok( ret, !ret ? (msg + " expected: " + serialArray(b) + " result: " + serialArray(a)) : msg ); } /** @@ -537,10 +533,7 @@ function isObj(a, b, msg) { } else ret = false; - config.assertions.push({ - result: ret, - message: msg - }); + QUnit.ok( ret, msg ); } /** @@ -599,10 +592,7 @@ function equals(actual, expected, message) { function push(result, actual, expected, message) { message = message || (result ? "okay" : "failed"); - config.assertions.push({ - result: result, - message: result ? message + ": " + expected : message + ", expected: " + jsDump.parse(expected) + " result: " + jsDump.parse(actual) - }); + QUnit.ok( result, result ? message + ": " + expected : message + ", expected: " + jsDump.parse(expected) + " result: " + jsDump.parse(actual) ); } /** test/testrunner.js 864188d646a09cc8e97a95a453b731cdfa034016 Paul Mucur mudge@mudge.name http://github.com/mudge/jquery_example/commit/5b425087153acfd8e93250ac10743aaf9a09f225 5b425087153acfd8e93250ac10743aaf9a09f225 2009-05-17T12:14:23-07:00 2009-05-17T12:14:23-07:00 Handle change events (as sent by plugins such as UI Datepicker) as well as using focus/blur. ba34ea9f75fc579fdeb1c1d4f97e6c713e918505 Paul Mucur mudge@mudge.name