You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/07/02 19:28:59 UTC
[3/6] git commit: WICKET-4635 Improve JavaScript files by applying
common JSHint rules
WICKET-4635 Improve JavaScript files by applying common JSHint rules
Enable linting of palette.js
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/58f33fcf
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/58f33fcf
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/58f33fcf
Branch: refs/heads/master
Commit: 58f33fcff7804d26148ce68b3fbe2e371ae14479
Parents: 93a6d41
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jul 2 16:34:13 2012 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jul 2 19:28:07 2012 +0200
----------------------------------------------------------------------
grunt.js | 4 +-
.../extensions/markup/html/form/palette/palette.js | 190 ++++++++-------
2 files changed, 102 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/58f33fcf/grunt.js
----------------------------------------------------------------------
diff --git a/grunt.js b/grunt.js
index a946f91..dee6915 100644
--- a/grunt.js
+++ b/grunt.js
@@ -26,10 +26,10 @@ module.exports = function(grunt) {
"wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxSelector.js"
],
lintExtensions = [
- "wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js"
+ "wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js",
+ "wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.js"
// "wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js",
// "wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js",
-// "wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.js",
// "wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/res/tree.js"
],
gruntJs = [
http://git-wip-us.apache.org/repos/asf/wicket/blob/58f33fcf/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.js
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.js b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.js
index c7427de..22b33f1 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.js
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.js
@@ -14,22 +14,31 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-if (typeof(Wicket) == "undefined") Wicket = { };
-if (typeof(Wicket.Palette) == "undefined") Wicket.Palette = { };
-
-Wicket.Palette.$ = function(id) {
- return document.getElementById(id);
-}
-
-Wicket.Palette.choicesOnFocus=function(choicesId, selectionId, recorderId) {
- Wicket.Palette.clearSelectionHelper(Wicket.Palette.$(selectionId));
-}
-
-Wicket.Palette.selectionOnFocus=function(choicesId, selectionId, recorderId) {
- Wicket.Palette.clearSelectionHelper(Wicket.Palette.$(choicesId));
-}
-
-Wicket.Palette.add=function(choicesId, selectionId, recorderId) {
+
+;(function (undefined) {
+ 'use strict';
+
+ if (typeof(Wicket) === "undefined") {
+ Wicket = { };
+ }
+
+ if (typeof(Wicket.Palette) === "undefined") {
+ Wicket.Palette = { };
+ }
+
+ Wicket.Palette.$ = function(id) {
+ return document.getElementById(id);
+ };
+
+ Wicket.Palette.choicesOnFocus=function(choicesId, selectionId, recorderId) {
+ Wicket.Palette.clearSelectionHelper(Wicket.Palette.$(selectionId));
+ };
+
+ Wicket.Palette.selectionOnFocus=function(choicesId, selectionId, recorderId) {
+ Wicket.Palette.clearSelectionHelper(Wicket.Palette.$(choicesId));
+ };
+
+ Wicket.Palette.add=function(choicesId, selectionId, recorderId) {
var choices=Wicket.Palette.$(choicesId);
var selection=Wicket.Palette.$(selectionId);
@@ -37,89 +46,90 @@ Wicket.Palette.add=function(choicesId, selectionId, recorderId) {
var recorder=Wicket.Palette.$(recorderId);
Wicket.Palette.updateRecorder(selection, recorder);
}
- }
-
-Wicket.Palette.remove=function(choicesId, selectionId, recorderId) {
- var choices=Wicket.Palette.$(choicesId);
- var selection=Wicket.Palette.$(selectionId);
-
- if (Wicket.Palette.moveHelper(selection, choices)) {
- var recorder=Wicket.Palette.$(recorderId);
- Wicket.Palette.updateRecorder(selection, recorder);
- }
-}
-
-Wicket.Palette.moveHelper=function(source, dest) {
- var dirty=false;
- for (var i=0;i<source.options.length;i++) {
- if (source.options[i].selected) {
- dest.appendChild(source.options[i]);
- i--;
- dirty=true;
+ };
+
+ Wicket.Palette.remove=function(choicesId, selectionId, recorderId) {
+ var choices=Wicket.Palette.$(choicesId);
+ var selection=Wicket.Palette.$(selectionId);
+
+ if (Wicket.Palette.moveHelper(selection, choices)) {
+ var recorder=Wicket.Palette.$(recorderId);
+ Wicket.Palette.updateRecorder(selection, recorder);
}
- }
- return dirty;
-}
-
-Wicket.Palette.moveUp=function(choicesId, selectionId, recorderId) {
+ };
+
+ Wicket.Palette.moveHelper=function(source, dest) {
+ var dirty=false;
+ for (var i=0;i<source.options.length;i++) {
+ if (source.options[i].selected) {
+ dest.appendChild(source.options[i]);
+ i--;
+ dirty=true;
+ }
+ }
+ return dirty;
+ };
+
+ Wicket.Palette.moveUp=function(choicesId, selectionId, recorderId) {
var selection=Wicket.Palette.$(selectionId);
if (Wicket.Palette.moveUpHelper(selection)) {
var recorder=Wicket.Palette.$(recorderId);
Wicket.Palette.updateRecorder(selection, recorder);
}
- }
-
-Wicket.Palette.moveUpHelper=function(box) {
- var dirty=false;
- for (var i=0;i<box.options.length;i++) {
- if (box.options[i].selected && i>0) {
- if(!box.options[i-1].selected) {
- box.insertBefore(box.options[i],box.options[i-1]);
- dirty=true;
- box.focus();
+ };
+
+ Wicket.Palette.moveUpHelper=function(box) {
+ var dirty=false;
+ for (var i=0;i<box.options.length;i++) {
+ if (box.options[i].selected && i>0) {
+ if(!box.options[i-1].selected) {
+ box.insertBefore(box.options[i],box.options[i-1]);
+ dirty=true;
+ box.focus();
+ }
}
}
- }
- return dirty;
-}
-
-Wicket.Palette.moveDown=function(choicesId, selectionId, recorderId) {
- var selection=Wicket.Palette.$(selectionId);
-
- if (Wicket.Palette.moveDownHelper(selection)) {
- var recorder=Wicket.Palette.$(recorderId);
- Wicket.Palette.updateRecorder(selection, recorder);
- }
-}
-
-Wicket.Palette.moveDownHelper=function(box) {
- var dirty=false;
- for (var i=box.options.length-1;i>=0;i--) {
- if (box.options[i].selected && i<box.options.length-1) {
- if(!box.options[i+1].selected) {
- box.insertBefore(box.options[i+1],box.options[i]);
- dirty=true;
+ return dirty;
+ };
+
+ Wicket.Palette.moveDown=function(choicesId, selectionId, recorderId) {
+ var selection=Wicket.Palette.$(selectionId);
+
+ if (Wicket.Palette.moveDownHelper(selection)) {
+ var recorder=Wicket.Palette.$(recorderId);
+ Wicket.Palette.updateRecorder(selection, recorder);
+ }
+ };
+
+ Wicket.Palette.moveDownHelper=function(box) {
+ var dirty=false;
+ for (var i=box.options.length-1;i>=0;i--) {
+ if (box.options[i].selected && i<box.options.length-1) {
+ if(!box.options[i+1].selected) {
+ box.insertBefore(box.options[i+1],box.options[i]);
+ dirty=true;
+ }
}
}
- }
- return dirty;
-}
-
-Wicket.Palette.updateRecorder=function(selection, recorder) {
- recorder.value="";
- for (var i=0;i<selection.options.length;i++) {
- recorder.value=recorder.value+selection.options[i].value;
- if (i+1<selection.options.length) {
- recorder.value=recorder.value+",";
+ return dirty;
+ };
+
+ Wicket.Palette.updateRecorder=function(selection, recorder) {
+ recorder.value="";
+ for (var i=0;i<selection.options.length;i++) {
+ recorder.value=recorder.value+selection.options[i].value;
+ if (i+1<selection.options.length) {
+ recorder.value=recorder.value+",";
+ }
}
- }
-
- if (recorder.onchange!=null) { recorder.onchange(); }
-}
-
-Wicket.Palette.clearSelectionHelper=function(box) {
- for (var i=0;i<box.options.length;i++) {
- box.options[i].selected=false;
- }
-}
+
+ if (recorder.onchange!=null) { recorder.onchange(); }
+ };
+
+ Wicket.Palette.clearSelectionHelper=function(box) {
+ for (var i=0;i<box.options.length;i++) {
+ box.options[i].selected=false;
+ }
+ };
+})();
\ No newline at end of file