You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2014/11/25 13:50:14 UTC
[09/19] portals-pluto git commit: Fixes during debgging: pass JSON
object with correct MIME type, fixed state comparison routing in hub impl,
fixed problem with 'busy' flag handling
Fixes during debgging: pass JSON object with correct MIME type, fixed state comparison routing in hub impl, fixed problem with 'busy' flag handling
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/80b632d8
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/80b632d8
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/80b632d8
Branch: refs/heads/PortletHub
Commit: 80b632d833e8d147d9da43d7a0f848433d1ca0b0
Parents: 92a8cb0
Author: Scott Nicklous <ms...@apache.org>
Authored: Sun Nov 23 11:58:04 2014 +0100
Committer: Scott Nicklous <ms...@apache.org>
Committed: Sun Nov 23 11:58:04 2014 +0100
----------------------------------------------------------------------
.../org/apache/pluto/driver/PortalDriverServlet.java | 1 +
pluto-portal/src/main/webapp/portlet.js | 10 ++++++++--
pluto-portal/src/main/webapp/portletHubImpl.js | 15 ++++++++-------
3 files changed, 17 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/80b632d8/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
----------------------------------------------------------------------
diff --git a/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java b/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
index ce50b35..5a7960e 100644
--- a/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
+++ b/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
@@ -155,6 +155,7 @@ public class PortalDriverServlet extends HttpServlet {
}
try {
container.doAction(portletWindow, request, response, false);
+ response.setContentType("application/json");
PageState ps = new PageState(request);
Writer writer = response.getWriter();
String jsondata = ps.toJSONString();
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/80b632d8/pluto-portal/src/main/webapp/portlet.js
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/portlet.js b/pluto-portal/src/main/webapp/portlet.js
index f32be18..5b5fb2d 100644
--- a/pluto-portal/src/main/webapp/portlet.js
+++ b/pluto-portal/src/main/webapp/portlet.js
@@ -688,8 +688,12 @@ var portlet = portlet || {};
updatePageState = function (upids) {
var ii;
- for (ii = 0; ii < upids.length; ii++) {
- _updateStateForPortlet(upids[ii]);
+ if (upids.length === 0) {
+ busy = false;
+ } else {
+ for (ii = 0; ii < upids.length; ii++) {
+ _updateStateForPortlet(upids[ii]);
+ }
}
},
@@ -732,6 +736,7 @@ var portlet = portlet || {};
pi.setState(state).then(function (upids) {
updatePageState(upids);
}, function (err) {
+ busy = false;
if (oeListeners[pid]) {
delay( function () {
oeListeners[pid].callback('portlet.onError', err);
@@ -921,6 +926,7 @@ var portlet = portlet || {};
pi.executeAction(parms, element).then(function (upids) {
updatePageState(upids);
}, function (err) {
+ busy = false;
if (oeListeners[pid]) {
delay( function () {
oeListeners[pid].callback('portlet.onError', err);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/80b632d8/pluto-portal/src/main/webapp/portletHubImpl.js
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/portletHubImpl.js b/pluto-portal/src/main/webapp/portletHubImpl.js
index 1c2b66e..2b76efb 100644
--- a/pluto-portal/src/main/webapp/portletHubImpl.js
+++ b/pluto-portal/src/main/webapp/portletHubImpl.js
@@ -140,7 +140,7 @@ var portlet = portlet || {};
* Throws exception if input state is malformed.
*/
stateChanged = function (nstate, pid) {
- var ostate, nparm, oparm, result = false;
+ var ostate, pname, nparm, oparm, result = false;
ostate = pageState[pid].state;
@@ -156,9 +156,10 @@ var portlet = portlet || {};
} else {
// Has a parameter changed or been added?
- for (nparm in nstate.parameters) {
- if (nstate.parameters.hasOwnProperty(nparm)) {
- oparm = ostate.parameters[nparm];
+ for (pname in nstate.parameters) {
+ if (nstate.parameters.hasOwnProperty(pname)) {
+ nparm = nstate.parameters[pname];
+ oparm = ostate.parameters[pname];
if (!_isParmEqual(nparm, oparm)) {
result = true;
}
@@ -166,9 +167,9 @@ var portlet = portlet || {};
}
// make sure no parameter was deleted
- for (oparm in ostate.parameters) {
- if (ostate.parameters.hasOwnProperty(oparm)) {
- if (!nstate.parameters[oparm]) {
+ for (pname in ostate.parameters) {
+ if (ostate.parameters.hasOwnProperty(pname)) {
+ if (!nstate.parameters[pname]) {
result = true;
}
}