You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by cm...@apache.org on 2012/06/27 19:23:30 UTC
[6/8] git commit: Add Grunt.js for easier JavaScript development.
Add Grunt.js for easier JavaScript development.
Helps to run JSHint and the QUnit tests (in PhantomJS)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0f74eec4
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0f74eec4
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0f74eec4
Branch: refs/heads/sandbox/resourcefinder
Commit: 0f74eec4f9aec24cb464811ae7bb9588459e0f80
Parents: 7480012
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jun 27 15:24:37 2012 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jun 27 15:24:37 2012 +0300
----------------------------------------------------------------------
grunt.js | 43 +++++++++++++++
.../wicket/ajax/res/js/wicket-ajax-jquery.js | 10 ++--
.../wicket/ajax/res/js/wicket-event-jquery.js | 4 +-
3 files changed, 50 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f74eec4/grunt.js
----------------------------------------------------------------------
diff --git a/grunt.js b/grunt.js
new file mode 100644
index 0000000..8d508c2
--- /dev/null
+++ b/grunt.js
@@ -0,0 +1,43 @@
+/*
+ * Grunt.js is a tool for automated JavaScript development
+ * https://github.com/cowboy/grunt
+ *
+ * To use it:
+ * 1) install node.js - http://nodejs.org/#download. This will install 'npm' (Node Package Manager) too
+ * 2) install phantomjs - http://code.google.com/p/phantomjs/downloads/list
+ * 3) install grunt - 'npm -g install grunt'
+ * 4) run it: grunt lint[:all] qunit[:index] qunit:local
+ */
+
+module.exports = function(grunt) {
+
+ // Project configuration.
+ grunt.initConfig({
+ lint: {
+ all: [
+ 'wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js',
+ 'wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery-debug.js',
+ 'wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js'
+ ]
+ },
+
+ jshint: {
+ options: {
+ smarttabs: true,
+ }
+ },
+
+ qunit: {
+ /*
+ * Runs all tests (w/ ajax).
+ * See ajax.js header for details how to setup it.
+ */
+ index: ['http://localhost/ajax-tests/test/js/all.html'],
+
+ /*
+ * Runs only local tests (w/o ajax ones).
+ */
+ local: ['wicket-core/src/test/js/all.html']
+ }
+ });
+};
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f74eec4/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
index 4bc2102..f723637 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
@@ -16,7 +16,7 @@
*/
/*jshint evil: true, nomen: false, onevar: false, regexp: false, strict: true, boss: true, undef: true, maxlen: 160, curly: true, eqeqeq: true */
-/*global document: false, jQuery:false, DOMParser: true, window: false, Wicket: true */
+/*global document: false, jQuery:false, DOMParser: true, window: false, Wicket: true, ActiveXObject: true */
/*
@@ -343,7 +343,7 @@
attrs.dt = 'xml';
}
- if (typeof(attrs.m) != 'string') {
+ if (typeof(attrs.m) !== 'string') {
attrs.m = 'GET';
}
@@ -618,7 +618,7 @@
rhttps = /^https:\/\//; // checks whether the string starts with https://
// support/check for non-relative redirectUrl like as provided and needed in a portlet context
- if (redirectUrl.charAt(0)==('/') || rhttp.test(redirectUrl) || rhttps.test(redirectUrl)) {
+ if (redirectUrl.charAt(0) === '/' || rhttp.test(redirectUrl) || rhttps.test(redirectUrl)) {
window.location = redirectUrl;
}
else {
@@ -775,7 +775,7 @@
try {
var root = envelope.getElementsByTagName("ajax-response")[0];
- if (root == null && envelope.compatMode == 'BackCompat') {
+ if (root === null && envelope.compatMode === 'BackCompat') {
envelope = htmlToDomDocument(envelope);
root = envelope.getElementsByTagName("ajax-response")[0];
}
@@ -2344,7 +2344,7 @@
if (false === jQuery.event.special.inputchange.keyDownPressed) {
window.setTimeout(function() {
- jQuery.event.special.inputchange.handler.apply(self, arguments)
+ jQuery.event.special.inputchange.handler.apply(self, arguments);
}, 10);
}
});
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f74eec4/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js
index 20e6304..3c7a56d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js
@@ -145,8 +145,8 @@
el = Wicket.$(element); // Wicket.$() is wicket-ajax.js. Is this too bad ?
}
- if (!el) {
- console.log('Cannot find element with id: ' + element);
+ if (!el && Wicket.Log) {
+ Wicket.Log.error('Cannot find element with id: ' + element);
}
jQuery(el).on(type, data, fn);