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 2012/06/28 00:09:36 UTC
svn commit: r1354754 - in
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp:
application/js/ApplicationController.js application/js/ApplicationModel.js
application/js/util/Storage.js application/js/view/panels/Console.js
index.html
Author: tveronezi
Date: Wed Jun 27 22:09:34 2012
New Revision: 1354754
URL: http://svn.apache.org/viewvc?rev=1354754&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-256
* save the last script code
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/Storage.js
- copied, changed from r1354412, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/El.js
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/ApplicationModel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html
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=1354754&r1=1354753&r2=1354754&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 Wed Jun 27 22:09:34 2012
@@ -69,6 +69,8 @@ TOMEE.ApplicationController = function (
var consolePanel = TOMEE.Console({
channel:channel
});
+ consolePanel.setScript(model.getLastScript());
+
var homeView = TOMEE.ApplicationViewHome({
center:consolePanel,
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationModel.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationModel.js?rev=1354754&r1=1354753&r2=1354754&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationModel.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationModel.js Wed Jun 27 22:09:34 2012
@@ -30,6 +30,14 @@ TOMEE.ApplicationModel = function (cfg)
var sessionData = {};
var executions = [];
+ var getLastScript = function () {
+ return TOMEE.utils.getSafe(TOMEE.storage.getLocal('lastScript_code'), '');
+ };
+
+ var setLastScript = function (code) {
+ TOMEE.storage.setLocal('lastScript_code', code);
+ };
+
var request = function (params) {
var errorHandler = params.error;
if (!errorHandler) {
@@ -145,6 +153,7 @@ TOMEE.ApplicationModel = function (cfg)
};
return {
+ getLastScript:getLastScript,
getUrlVars:getUrlVars,
executeCommands:executeCommands,
logout:function () {
@@ -203,6 +212,8 @@ TOMEE.ApplicationModel = function (cfg)
scriptCode:codeText
},
success:function (data) {
+ setLastScript(codeText);
+
executionBean.success = true;
executionBean.data = data['GetSystemInfo'];
executionBean.end = (new Date());
Copied: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/Storage.js (from r1354412, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/El.js)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/Storage.js?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/Storage.js&p1=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/El.js&r1=1354412&r2=1354754&rev=1354754&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/El.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/Storage.js Wed Jun 27 22:09:34 2012
@@ -17,77 +17,37 @@
"use strict";
*/
-TOMEE.el = (function () {
- var getBorderSize = function (el) {
- return el.outerHeight(true) - el.height();
- };
-
- var getElMap = function (elCfg) {
- var elMap = {};
- mountEl(elCfg, elMap);
- return elMap;
- };
-
- var mountEl = function (elCfg, elMap) {
- if (elCfg.el) {
- elCfg.el.detach();
+TOMEE.storage = (function () {
- if (elCfg.elName) {
- elMap[elCfg.elName] = elCfg.el;
- }
- //we dont need to construct it. it is already done
- return elCfg.el;
- }
-
- var el = $('<' + elCfg.tag + '></' + elCfg.tag + '>');
-
- if (elCfg.elName) {
- elMap[elCfg.elName] = el;
- }
+ var defaultStore = (function() {
+ var myStore = {};
- (function () {
- var attrs = elCfg.attributes;
- for (var key in attrs) {
- el.attr(key, attrs[key]);
+ return {
+ getItem: function(key) {
+ return myStore[key];
+ },
+ setItem: function(key, value) {
+ myStore[key] = value;
}
- })();
+ };
- (function () {
- var listeners = elCfg.listeners;
- for (var key in listeners) {
- el.bind(key, listeners[key]);
- }
- })();
+ })();
- if (elCfg.cls) {
- el.addClass(elCfg.cls);
- }
-
- var children = TOMEE.utils.getArray(elCfg.children);
- for (var i = 0; i < children.length; i++) {
- el.append(mountEl(children[i], elMap));
- }
-
- if (elCfg.html) {
- el.html(elCfg.html);
- }
-
- if (elCfg.createCallback) {
- elCfg.createCallback(el);
- }
-
- return el;
- };
+ var session = TOMEE.utils.getSafe(window.sessionStorage, defaultStore);
+ var local = TOMEE.utils.getSafe(window.localStorage, defaultStore);
return {
- getElMap:getElMap,
- getBorderSize:getBorderSize,
- getLocationValue:function (value) {
- if ($.isNumeric(value)) {
- return value + 'px';
- } else {
- return TOMEE.utils.getSafe(value, '0px');
- }
+ getSession: function(key) {
+ return session.getItem(key);
+ },
+ setSession: function(key, value) {
+ session.setItem(key, value);
+ },
+ getLocal: function(key) {
+ return local.getItem(key);
+ },
+ setLocal: function(key, value) {
+ local.setItem(key, value);
}
}
})();
\ No newline at end of file
Modified: 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=1354754&r1=1354753&r2=1354754&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js Wed Jun 27 22:09:34 2012
@@ -82,6 +82,9 @@ TOMEE.Console = function (cfg) {
};
return {
+ setScript: function(script) {
+ elText.main.html(script);
+ },
setHeight:function(height) {
console.setHeight(height);
},
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=1354754&r1=1354753&r2=1354754&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 Wed Jun 27 22:09:34 2012
@@ -17,6 +17,7 @@
<script src="application/js/util/Log.js"></script>
<script src="application/js/util/Obj.js"></script>
<script src="application/js/util/Sequence.js"></script>
+ <script src="application/js/util/Storage.js"></script>
<script src="application/js/ApplicationChannel.js"></script>
<script src="application/js/ApplicationController.js"></script>