Author: tveronezi
Date: Mon Jun 11 12:42:24 2012
New Revision: 1348824
URL: http://svn.apache.org/viewvc?rev=1348824&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-224
* preparing context menu
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/I18N.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationView.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewHome.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Tree.js
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js?rev=1348824&r1=1348823&r2=1348824&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js
Mon Jun 11 12:42:24 2012
@@ -92,6 +92,14 @@ TOMEE.ApplicationController = function (
//params.path, params.bean, params.parentEl
homeView.loadJndi(params);
});
+
+ channel.bind('element.right.click', function (params) {
+ //params.data, params.left, params.top
+ if (params.panelKey === 'jndi') {
+ homeView.jndiContextMenu(params);
+ }
+ });
+
})();
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/I18N.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/I18N.js?rev=1348824&r1=1348823&r2=1348824&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/I18N.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/I18N.js
Mon Jun 11 12:42:24 2012
@@ -28,21 +28,23 @@ TOMEE.I18N = (function () {
'application.home':'Home',
'application.apps':'Apps',
+
'application.log':'Log',
+ 'application.log.load':'Load',
'application.deployments':'Deployments',
'application.jdni':'Jndi',
+ 'application.jdni.lookup':'Lookup',
+
'application.saved.objects':'Saved Objects',
- 'application.console':'Console',
- 'application.mdbs':'MDBs',
- 'application.ws':'Webservices',
+ 'application.saved.objects.load':'Load',
+ 'application.console':'Console',
'application.console.execute':'Execute',
- 'application.log.load':'Load',
-
- 'application.saved.objects.load':'Load',
+ 'application.mdbs':'MDBs',
+ 'application.ws':'Webservices',
'dummy':'dummy'
};
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationView.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationView.js?rev=1348824&r1=1348823&r2=1348824&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationView.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationView.js
Mon Jun 11 12:42:24 2012
@@ -25,6 +25,11 @@ TOMEE.ApplicationView = function (cfg) {
var windowEl = $(window);
+ //disable default contextmenu
+ $(document).bind("contextmenu",function(e){
+ return false;
+ });
+
var toolbar = TOMEE.ApplicationToolbar({
channel:channel
});
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewHome.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewHome.js?rev=1348824&r1=1348823&r2=1348824&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewHome.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewHome.js
Mon Jun 11 12:42:24 2012
@@ -24,26 +24,13 @@ TOMEE.ApplicationViewHome = function (cf
var jndiMenu = TOMEE.components.Menu({
commands:[
{
- text:'commandA',
- callback:function () {
- }
- },
- {
- text:'commandB',
- callback:function () {
- }
- },
- {
- text:'commandC',
- callback:function () {
+ text:TOMEE.I18N.get('application.jdni.lookup'),
+ callback:function (data) {
}
}
]
});
-// jndiMenu.showAt({
-// left:100,
-// top:100
-// });
+
var elMapContent = TOMEE.el.getElMap({
elName:'main',
@@ -286,6 +273,13 @@ TOMEE.ApplicationViewHome = function (cf
wsPanel.getEl().detach();
}
}
+ },
+ jndiContextMenu:function (opts) {
+ jndiMenu.showAt({
+ left:opts.left,
+ top:opts.top,
+ data:opts.data
+ });
}
};
};
\ No newline at end of file
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Tree.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Tree.js?rev=1348824&r1=1348823&r2=1348824&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Tree.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Tree.js
Mon Jun 11 12:42:24 2012
@@ -51,9 +51,17 @@ TOMEE.components.Tree = function (cfg) {
var myI = $('<i style="padding-right: 5px;"></i>');
span.append(myI);
-
span.append(getText(data));
+ span.bind('contextmenu', function (event) {
+ channel.send('element.right.click', {
+ panelKey:myKey,
+ data:data,
+ left: event.clientX,
+ top: event.clientY
+ });
+ });
+
var li = TOMEE.el.getElMap({
elName:'el',
tag:'li',
