You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2013/01/15 13:52:43 UTC
svn commit: r1433383 - in /tomee/trunk/openejb: ./ tomee/tomee-webapp/
tomee/tomee-webapp/src/main/webapp/ tomee/tomee-webapp/src/main/webapp/app/
tomee/tomee-webapp/src/main/webapp/app/js/
tomee/tomee-webapp/src/main/webapp/app/js/util/ tomee/tomee-we...
Author: tveronezi
Date: Tue Jan 15 12:52:42 2013
New Revision: 1433383
URL: http://svn.apache.org/viewvc?rev=1433383&view=rev
Log:
-https://issues.apache.org/jira/browse/TOMEE-232
-lint integration
Added:
tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/config.js
- copied unchanged from r1433286, tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/config.js
tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/start.js
- copied, changed from r1433286, tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/start.js
Removed:
tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/config.js
tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/start.js
Modified:
tomee/trunk/openejb/Makefile
tomee/trunk/openejb/NOTICE
tomee/trunk/openejb/tomee/tomee-webapp/pom.xml
tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/Application.js
tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationModel.js
tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/DelayedTask.js
tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js
tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html
Modified: tomee/trunk/openejb/Makefile
URL: http://svn.apache.org/viewvc/tomee/trunk/openejb/Makefile?rev=1433383&r1=1433382&r2=1433383&view=diff
==============================================================================
--- tomee/trunk/openejb/Makefile (original)
+++ tomee/trunk/openejb/Makefile Tue Jan 15 12:52:42 2013
@@ -79,4 +79,7 @@ install-tomee: $(TOMCAT_ZIP)
install-all:
mvn clean && mvn install -DskipTests=true
-.PHONY: install-all install-tomee tomcat tomee start-tomee reload-tomee kill-tomee up-static
+run-lint:
+ cd ./tomee/tomee-webapp/ && mvn jslint4java:lint
+
+.PHONY: install-all install-tomee tomcat tomee start-tomee reload-tomee kill-tomee up-static run-lint
Modified: tomee/trunk/openejb/NOTICE
URL: http://svn.apache.org/viewvc/tomee/trunk/openejb/NOTICE?rev=1433383&r1=1433382&r2=1433383&view=diff
==============================================================================
--- tomee/trunk/openejb/NOTICE (original)
+++ tomee/trunk/openejb/NOTICE Tue Jan 15 12:52:42 2013
@@ -24,4 +24,7 @@ You can obtain a copy of the License at:
You can obtain a copy of the License at: https://github.com/wycats/handlebars.js/blob/master/LICENSE
"codemirror" is licensed under the MIT License.
-You can obtain a copy of the License at: http://codemirror.net/LICENSE
\ No newline at end of file
+You can obtain a copy of the License at: http://codemirror.net/LICENSE
+
+"require.js" is licensed under the MIT License.
+You can obtain a copy of the License at: https://github.com/jrburke/requirejs/blob/master/LICENSE
\ No newline at end of file
Modified: tomee/trunk/openejb/tomee/tomee-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tomee/trunk/openejb/tomee/tomee-webapp/pom.xml?rev=1433383&r1=1433382&r2=1433383&view=diff
==============================================================================
--- tomee/trunk/openejb/tomee/tomee-webapp/pom.xml (original)
+++ tomee/trunk/openejb/tomee/tomee-webapp/pom.xml Tue Jan 15 12:52:42 2013
@@ -69,7 +69,7 @@
<failOnError>true</failOnError>
<options>
<vars>true</vars>
- <predef>$,CodeMirror,Handlebars,define,console,window,document,setTimeout,clearTimeout,sessionStorage</predef>
+ <predef>$,CodeMirror,Handlebars,define,window,console,requirejs,require,APP_CONFIG</predef>
<indent>4</indent>
</options>
<sourceFolders>
Modified: tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/Application.js
URL: http://svn.apache.org/viewvc/tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/Application.js?rev=1433383&r1=1433382&r2=1433383&view=diff
==============================================================================
--- tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/Application.js (original)
+++ tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/Application.js Tue Jan 15 12:52:42 2013
@@ -30,7 +30,7 @@
define(requirements, function (controller) {
return {
start: function () {
- $(document).ready(function () {
+ $(window.document).ready(function () {
controller.newObject();
});
}
Modified: tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationModel.js
URL: http://svn.apache.org/viewvc/tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationModel.js?rev=1433383&r1=1433382&r2=1433383&view=diff
==============================================================================
--- tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationModel.js (original)
+++ tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationModel.js Tue Jan 15 12:52:42 2013
@@ -141,11 +141,11 @@
function sendMessage(bean) {
if (isSocketReady()) {
- bean.sessionId = sessionStorage.sessionId;
+ bean.sessionId = window.sessionStorage.sessionId;
var str = JSON.stringify(bean);
appSocket.send(str);
} else {
- setTimeout(function () {
+ window.setTimeout(function () {
sendMessage(bean);
}, 1000);
}
@@ -161,7 +161,7 @@
});
channel.bind('server-command-callback', 'Logout', function (data) {
- delete sessionStorage.sessionId;
+ delete window.sessionStorage.sessionId;
});
function sendRequest(bean) {
@@ -183,14 +183,14 @@
(function () {
var params = {};
- if (sessionStorage.sessionId) {
- params.sessionId = sessionStorage.sessionId;
+ if (window.sessionStorage.sessionId) {
+ params.sessionId = window.sessionStorage.sessionId;
}
sendRequest({
servlet: 'session',
params: params,
callback: function (data) {
- sessionStorage.sessionId = data.sessionId;
+ window.sessionStorage.sessionId = data.sessionId;
sessionReady = true;
channel.send('server-connection', 'session-ready', {});
}
Copied: tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/start.js (from r1433286, tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/start.js)
URL: http://svn.apache.org/viewvc/tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/start.js?p2=tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/start.js&p1=tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/start.js&r1=1433286&r2=1433383&rev=1433383&view=diff
==============================================================================
--- tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/start.js (original)
+++ tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/start.js Tue Jan 15 12:52:42 2013
@@ -16,10 +16,12 @@
* limitations under the License.
*/
-require.config(APP_CONFIG);
+(function () {
+ 'use strict';
-requirejs(['Application', 'lib/less', 'lib/bootstrap'],
- function (app) {
+ require.config(APP_CONFIG);
+
+ requirejs(['Application', 'lib/less', 'lib/bootstrap'], function (app) {
app.start();
- }
-);
+ });
+}());
Modified: tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/DelayedTask.js
URL: http://svn.apache.org/viewvc/tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/DelayedTask.js?rev=1433383&r1=1433382&r2=1433383&view=diff
==============================================================================
--- tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/DelayedTask.js (original)
+++ tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/DelayedTask.js Tue Jan 15 12:52:42 2013
@@ -32,11 +32,11 @@
// Cancel previous execution
if (currentTimer !== null) {
- clearTimeout(currentTimer);
+ window.clearTimeout(currentTimer);
}
if (millis) {
- currentTimer = setTimeout(callback, millis);
+ currentTimer = window.setTimeout(callback, millis);
} else {
// No timeout set.
callback();
Modified: tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js
URL: http://svn.apache.org/viewvc/tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js?rev=1433383&r1=1433382&r2=1433383&view=diff
==============================================================================
--- tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js (original)
+++ tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js Tue Jan 15 12:52:42 2013
@@ -118,7 +118,7 @@
});
//disable default contextmenu
- $(document).bind("contextmenu", function (e) {
+ $(window.document).bind("contextmenu", function (e) {
return false;
});
Modified: tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html?rev=1433383&r1=1433382&r2=1433383&view=diff
==============================================================================
--- tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html (original)
+++ tomee/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html Tue Jan 15 12:52:42 2013
@@ -23,8 +23,8 @@
<link rel="stylesheet" href="app/lib/codemirror/codemirror-2.34/lib/codemirror.css">
<link rel="stylesheet/less" type="text/css" href="app/tomee.less">
<script src="app/lib/require/require.js"></script>
- <script src="app/config.js"></script>
- <script src="app/start.js"></script>
+ <script src="app/js/config.js"></script>
+ <script src="app/js/start.js"></script>
</head>
<body></body>
</html>