Author: tveronezi
Date: Mon Jun 11 16:51:18 2012
New Revision: 1348934
URL: http://svn.apache.org/viewvc?rev=1348934&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-224
* splitting the ApplicationViewHome.js object
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewHome.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html
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=1348934&r1=1348933&r2=1348934&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 16:51:18 2012
@@ -21,27 +21,6 @@ TOMEE.ApplicationViewHome = function (cf
var channel = cfg.channel;
- var jndiMenu = TOMEE.components.Menu({
- commands:[
- {
- text:TOMEE.I18N.get('application.jdni.lookup'),
- callback:function (data) {
- var panel = TOMEE.components.Panel({
- title:TOMEE.I18N.get('application.jdni.class'),
- extraStyles:{
- width:'500px',
- height:'200px'
- }
- });
- panel.showAt({
- modal: true
- });
- }
- }
- ]
- });
-
-
var elMapContent = TOMEE.el.getElMap({
elName:'main',
tag:'div',
@@ -73,141 +52,21 @@ TOMEE.ApplicationViewHome = function (cf
]
});
- var jndiPanel = (function () {
- var jndi = TOMEE.components.Panel({
- title:TOMEE.I18N.get('application.jdni')
- });
-
- var tree = TOMEE.components.Tree({
- key:'jndi',
- channel:channel,
- getText:function (data) {
- return data.name;
- },
- childrenPropertyName:'children'
- });
-
- var treeEl = tree.getEl();
- jndi.getContentEl().append(treeEl);
-
- return {
- getEl:function () {
- return jndi.getEl();
- },
- load:function (data) {
- tree.load(data.parentEl, data.names);
- }
- };
- })();
-
- var savedPanel = (function () {
- var saved = TOMEE.components.Panel({
- title:TOMEE.I18N.get('application.saved.objects'),
- actions:[
- {
- text:TOMEE.I18N.get('application.saved.objects.load'),
- listeners:{
- 'click':function () {
- channel.send('application.saved.objects.load', {});
- }
- }
-
- }
- ]
- });
-
- var table = TOMEE.components.Table({
- channel:channel
- });
-
- saved.getContentEl().append(table.getEl());
+ var jndiPanel = TOMEE.Jndi({
+ channel: cfg.channel
+ });
- return {
- getEl:function () {
- return saved.getEl();
- },
- load:function (data) {
- var arr = TOMEE.utils.toArray(data, function (key, obj) {
- return {
- name:key,
- value:obj
- };
- });
-
- table.load(arr, function (bean) {
- return [bean.name, bean.value];
- });
- }
- };
- })();
+ var savedPanel = TOMEE.Saved({
+ channel: cfg.channel
+ });
elMapContent['left'].append(jndiPanel.getEl());
elMapContent['left'].append(savedPanel.getEl());
- var consolePanel = (function () {
- var console = TOMEE.components.Panel({
- title:TOMEE.I18N.get('application.console'),
- extraStyles:{
- height:'500px'
- }
- });
-
- var elText = TOMEE.el.getElMap({
- elName:'main',
- tag:'textarea',
- attributes:{
- style:'height: 469px; width: 100%;border: 0px;padding:
0px;margin: 0px;'
- }
- });
-
- var elBottomBar = TOMEE.el.getElMap({
- elName:'main',
- tag:'form',
- cls:'well form-inline',
- attributes:{
- style:'height: 27px;margin-bottom: 0px;padding-top:
1px;padding-left: 1px;padding-bottom: 1px;padding-right: 1px;'
- },
- children:[
- {
- tag:'div',
- cls:'pull-right',
- children:[
- {
- elName:'scriptSelector',
- tag:'select'
- },
- {
- elName:'executeBtn',
- tag:'button',
- cls:'btn',
- html:TOMEE.I18N.get('application.console.execute')
- }
- ]
- }
- ]
- });
-
- var el = console.getContentEl();
- el.append(elText.main);
- el.append(elBottomBar.main);
-
- elBottomBar.main.bind('executeBtn', function () {
- var text = elText.main.val();
- var script = elBottomBar.scriptSelector.val();
- channel.send('trigger.console.exec', {
- codeType:script,
- codeText:text
- });
- });
-
- return {
- getEl:function () {
- return console.getEl();
- },
- scriptSelector:elBottomBar.scriptSelector
- };
- })();
+ var consolePanel = TOMEE.Console({
+ channel: cfg.channel
+ });
elMapContent['center'].append(consolePanel.getEl());
@@ -238,27 +97,9 @@ TOMEE.ApplicationViewHome = function (cf
elMapContent['right'].append(mdbsPanel.getEl());
elMapContent['right'].append(wsPanel.getEl());
- var loadScriptsField = function (languages) {
- var getOption = function (lang) {
- var option = $('<option></option>');
- option.attr('value', lang);
- option.append(lang);
- return option;
- };
-
- var selector = consolePanel.scriptSelector;
- selector.empty();
- if (!languages) {
- return;
- }
- for (var i = 0; i < languages.length; i++) {
- selector.append(getOption(languages[i]));
- }
- };
-
return {
loadJndi:function (data) {
- jndiPanel.load(data);
+ jndiPanel.loadJndi(data);
},
loadSavedObjects:function (data) {
savedPanel.load(data);
@@ -266,7 +107,7 @@ TOMEE.ApplicationViewHome = function (cf
getEl:function () {
return elMapContent.main;
},
- setSupportedScriptLanguages:loadScriptsField,
+ setSupportedScriptLanguages:consolePanel.loadScriptsField,
setTomeeVersion:function (myTomee) {
if (!myTomee.hasMdbs && !myTomee.hasWebservices) {
@@ -285,11 +126,7 @@ TOMEE.ApplicationViewHome = function (cf
}
},
jndiContextMenu:function (opts) {
- jndiMenu.showAt({
- left:opts.left,
- top:opts.top,
- data:opts.data
- });
+ jndiPanel.jndiContextMenu(opts);
}
};
}
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js?rev=1348934&view=auto
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js
(added)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js
Mon Jun 11 16:51:18 2012
@@ -0,0 +1,103 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+TOMEE.Console = function (cfg) {
+ "use strict";
+
+ var channel = cfg.channel;
+
+ var console = TOMEE.components.Panel({
+ title:TOMEE.I18N.get('application.console'),
+ extraStyles:{
+ height:'500px'
+ }
+ });
+
+ var elText = TOMEE.el.getElMap({
+ elName:'main',
+ tag:'textarea',
+ attributes:{
+ style:'height: 469px; width: 100%;border: 0px;padding: 0px;margin:
0px;'
+ }
+ });
+
+ var elBottomBar = TOMEE.el.getElMap({
+ elName:'main',
+ tag:'form',
+ cls:'well form-inline',
+ attributes:{
+ style:'height: 27px;margin-bottom: 0px;padding-top:
1px;padding-left: 1px;padding-bottom: 1px;padding-right: 1px;'
+ },
+ children:[
+ {
+ tag:'div',
+ cls:'pull-right',
+ children:[
+ {
+ elName:'scriptSelector',
+ tag:'select'
+ },
+ {
+ elName:'executeBtn',
+ tag:'button',
+ cls:'btn',
+ html:TOMEE.I18N.get('application.console.execute')
+ }
+ ]
+ }
+ ]
+ });
+
+ var el = console.getContentEl();
+ el.append(elText.main);
+ el.append(elBottomBar.main);
+
+ elBottomBar.executeBtn.bind('click', function () {
+ var text = elText.main.val();
+ var script = elBottomBar.scriptSelector.val();
+ channel.send('trigger.console.exec', {
+ codeType:script,
+ codeText:text
+ });
+ });
+
+ var loadScriptsField = function (languages) {
+ var getOption = function (lang) {
+ var option = $('<option></option>');
+ option.attr('value', lang);
+ option.append(lang);
+ return option;
+ };
+
+ var selector = elBottomBar.scriptSelector;
+ selector.empty();
+ if (!languages) {
+ return;
+ }
+ for (var i = 0; i < languages.length; i++) {
+ selector.append(getOption(languages[i]));
+ }
+ };
+
+ return {
+ getEl:function () {
+ return console.getEl();
+ },
+ loadScriptsField:loadScriptsField
+ };
+};
\ No newline at end of file
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.js?rev=1348934&view=auto
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.js
(added)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.js
Mon Jun 11 16:51:18 2012
@@ -0,0 +1,76 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+TOMEE.Jndi = function (cfg) {
+ "use strict";
+
+ var channel = cfg.channel;
+
+ var jndiMenu = TOMEE.components.Menu({
+ commands:[
+ {
+ text:TOMEE.I18N.get('application.jdni.lookup'),
+ callback:function (data) {
+ var panel = TOMEE.components.Panel({
+ title:TOMEE.I18N.get('application.jdni.class'),
+ extraStyles:{
+ width:'500px',
+ height:'200px'
+ }
+ });
+ panel.showAt({
+ modal:true
+ });
+ }
+ }
+ ]
+ });
+
+
+ var jndi = TOMEE.components.Panel({
+ title:TOMEE.I18N.get('application.jdni')
+ });
+
+ var tree = TOMEE.components.Tree({
+ key:'jndi',
+ channel:channel,
+ getText:function (data) {
+ return data.name;
+ },
+ childrenPropertyName:'children'
+ });
+
+ var treeEl = tree.getEl();
+ jndi.getContentEl().append(treeEl);
+
+ return {
+ loadJndi:function (data) {
+ tree.load(data.parentEl, data.names);
+ },
+ getEl:function () {
+ return jndi.getEl();
+ },
+ jndiContextMenu:function (opts) {
+ jndiMenu.showAt({
+ left:opts.left,
+ top:opts.top,
+ data:opts.data
+ });
+ }
+ };
+};
\ No newline at end of file
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js?rev=1348934&view=auto
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js
(added)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js
Mon Jun 11 16:51:18 2012
@@ -0,0 +1,62 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+TOMEE.Saved = function (cfg) {
+ "use strict";
+
+ var channel = cfg.channel;
+
+ var saved = TOMEE.components.Panel({
+ title:TOMEE.I18N.get('application.saved.objects'),
+ actions:[
+ {
+ text:TOMEE.I18N.get('application.saved.objects.load'),
+ listeners:{
+ 'click':function () {
+ channel.send('application.saved.objects.load', {});
+ }
+ }
+
+ }
+ ]
+ });
+
+ var table = TOMEE.components.Table({
+ channel:channel
+ });
+
+ saved.getContentEl().append(table.getEl());
+
+ return {
+ getEl:function () {
+ return saved.getEl();
+ },
+ load:function (data) {
+ var arr = TOMEE.utils.toArray(data, function (key, obj) {
+ return {
+ name:key,
+ value:obj
+ };
+ });
+
+ table.load(arr, function (bean) {
+ return [bean.name, bean.value];
+ });
+ }
+ };
+};
\ No newline at end of file
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html?rev=1348934&r1=1348933&r2=1348934&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html Mon Jun
11 16:51:18 2012
@@ -34,6 +34,10 @@
<script src="application/js/view/ApplicationViewApps.js"></script>
<script src="application/js/view/ApplicationViewLog.js"></script>
+ <script src="application/js/view/panels/Jndi.js"></script>
+ <script src="application/js/view/panels/Saved.js"></script>
+ <script src="application/js/view/panels/Console.js"></script>
+
</head>
<body></body>
</html>
