From 49f4223605b4946a2bf6831262dd442375a4a929 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 23 May 2011 02:28:47 +0000
Subject: Simplify page navigations and optimize layout and event handling on
 touch devices. Optimize caching and minimize Ajax calls.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1126297 13f79535-47bb-0310-9956-ffa450edef68
---
 .../modules/edit/htdocs/app/cache-manifest.cmf     | 25 ---------
 .../modules/edit/htdocs/app/cache-manifest.cmf.off | 25 +++++++++
 sca-cpp/trunk/modules/edit/htdocs/app/index.html   | 60 +++++++++++++++-------
 3 files changed, 67 insertions(+), 43 deletions(-)
 delete mode 100644 sca-cpp/trunk/modules/edit/htdocs/app/cache-manifest.cmf
 create mode 100644 sca-cpp/trunk/modules/edit/htdocs/app/cache-manifest.cmf.off

(limited to 'sca-cpp/trunk/modules/edit/htdocs/app')
diff --git a/sca-cpp/trunk/modules/edit/htdocs/app/cache-manifest.cmf b/sca-cpp/trunk/modules/edit/htdocs/app/cache-manifest.cmf
deleted file mode 100644
index 460f0b6bbd..0000000000
--- a/sca-cpp/trunk/modules/edit/htdocs/app/cache-manifest.cmf
+++ /dev/null
@@ -1,25 +0,0 @@
-CACHE MANIFEST
-
-# Common resources
-all-min.js
-config.js
-ui-min.css
-
-# App resources
-app.html
-data/index.html
-favicon.ico
-index.html
-public/app.png
-public/iframe.html
-public/img.png
-public/notauth.html
-public/notfound.html
-public/notyet.html
-public/oops.html
-public/touchicon.png
-robots.txt
-
-NETWORK:
-*
-
diff --git a/sca-cpp/trunk/modules/edit/htdocs/app/cache-manifest.cmf.off b/sca-cpp/trunk/modules/edit/htdocs/app/cache-manifest.cmf.off
new file mode 100644
index 0000000000..bd44d87aa1
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/htdocs/app/cache-manifest.cmf.off
@@ -0,0 +1,25 @@
+CACHE MANIFEST
+
+# Common resources
+/all-min.js
+/config.js
+/ui-min.css
+
+# App resources
+/
+/app.html
+/data/index.html
+/favicon.ico
+/public/app.png
+/public/iframe.html
+/public/img.png
+/public/notauth.html
+/public/notfound.html
+/public/notyet.html
+/public/oops.html
+/public/touchicon.png
+/robots.txt
+
+NETWORK:
+*
+
diff --git a/sca-cpp/trunk/modules/edit/htdocs/app/index.html b/sca-cpp/trunk/modules/edit/htdocs/app/index.html
index fe7edd44b9..99a523362f 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/app/index.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/app/index.html
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<html manifest="/cache-manifest.cmf">
+<html>
 <head>
 <title>App</title>
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
@@ -37,20 +37,25 @@ document.title = window.location.hostname.split('.')[0];
 
 <div id="app"></div>
 
-<span id="appFrame"></span>
+<span id="appbuffer"></span>
+<span id="appebuffer"></span>
 
 </div>
 
 <script type="text/javascript">
-if (ui.isIE()) $('bodydiv').style.right = -20;
 
 /**
- * Start, stop, timer and geolocation components.
+ * The main app div.
+ */
+var appdiv = $('app');
+
+/**
+ * Start, stop, timer and location components.
  */
 var startcomp = sca.httpclient('start', '/start');
 var stopcomp = sca.httpclient('stop', '/stop');
 var timercomp = sca.httpclient('timer', '/timer');
-var geolocationcomp = sca.httpclient('geolocation', '/geolocation');
+var locationcomp = sca.httpclient('location', '/location');
 
 /**
  * Find a named value in a tree of elements.
@@ -146,13 +151,13 @@ function setwidgetvalue(e, dv) {
         return t;
     }
     if (e.className == 'list') {
-        var t = ui.datalist(mklist(dv));
-        car(childElements(e)).innerHTML = t;
+        var t = ui.datalist(isNil(dv)? mklist() : mklist(dv));
+        e.innerHTML = t;
         return t;
     }
     if (e.className == 'table') {
-        var t = ui.datatable(mklist(dv));
-        car(childElements(e)).innerHTML = t;
+        var t = ui.datatable(isNil(dv)? mklist() : mklist(dv));
+        e.innerHTML = t;
         return t;
     }
     if (e.className == 'link') {
@@ -190,7 +195,7 @@ function displaydata(l) {
         return e;
     }
 
-    map(updatewidget, filter(function(e) { return !isNil(e.id); }, nodeList(ui.elementByID($('app'), 'page').childNodes)));
+    map(updatewidget, filter(function(e) { return !isNil(e.id) && e.id.substring(0, 5) != 'page:'; }, nodeList(ui.elementByID(appdiv, 'page').childNodes)));
     return true;
 }
 
@@ -219,10 +224,11 @@ function displaydoc(doc) {
 function bindwidgethandler(e) {
     if (e.className == 'button') {
         var b = car(childElements(e));
-        b.onclick = function() { return buttonClickHandler(e.id); };
+        b.name = e.id;
+        b.onclick = function() { return buttonClickHandler(b.value); };
         return e;
     }
-    if (e.className == 'button' || e.className == 'entry' || e.className == 'password' || e.className == 'checkbox') {
+    if (e.className == 'entry' || e.className == 'password' || e.className == 'checkbox') {
         car(childElements(e)).name = e.id;
         return e;
     }
@@ -262,6 +268,15 @@ function fixupwidget(e) {
     return e;
 }
 
+/**
+ * Set initial value of a widget.
+ */
+function initwidget(e) {
+    if (!isNil(e.id) && e.id.substring(0, 5) != 'page:')
+        setwidgetvalue(e, mklist());
+    return e;
+}
+
 /**
  * Get app data from the main app page component.
  */
@@ -291,6 +306,7 @@ function getpagedata() {
 
         // Initial setup of a widget
         function setupwidget(e) {
+            initwidget(e);
             fixupwidget(e);
             bindwidgethandler(e);
         }
@@ -298,17 +314,24 @@ function getpagedata() {
         // Get the component app data
         var doc = startcomp.get(window.location.search);
         try {
-            $('app').innerHTML = $('appFrame').contentDocument.body.innerHTML;
+            var appFrame = $('appFrame');
+            if (!isNil(appFrame.contentDocument.body)) {
+                appdiv.innerHTML = appFrame.contentDocument.body.innerHTML;
+            } else {
+                $('appebuffer').appendChild(appFrame.contentDocument.documentElement);
+                appdiv.innerHTML = appebuffer.innerHTML;
+                appebuffer.innerHTML = '';
+            }
 
             // Initial setup of the widgets
-            map(setupwidget, filter(function(e) { return !isNil(e.id); }, nodeList(ui.elementByID($('app'), 'page').childNodes)));
+            map(setupwidget, filter(function(e) { return !isNil(e.id); }, nodeList(ui.elementByID(appdiv, 'page').childNodes)));
 
             // Display data on the page
             displaypage(doc);
 
             // Get and eval the optional timer and location watch setup scripts
             evalcompinit(timercomp.get('setup'));
-            evalcompinit(geolocationcomp.get('setup'));
+            evalcompinit(locationcomp.get('setup'));
             return true;
 
         } catch(e) {
@@ -339,7 +362,7 @@ function compquery() {
         return append(nodeList(n.childNodes), reduce(append, mklist(), map(childrenList, nodeList(n.childNodes))));
     }
 
-    var args = map(queryarg, filter(function(e) { return !isNil(e.id) && !isNil(inputvalue(e)); }, childrenList(ui.elementByID($('app'), 'page'))));
+    var args = map(queryarg, filter(function(e) { return !isNil(e.id) && !isNil(inputvalue(e)); }, childrenList(ui.elementByID(appdiv, 'page'))));
 
     // Append current location properties if known
     if (!isNil(geoposition)) {
@@ -378,6 +401,7 @@ function intervalHandler() {
  * Setup an interval timer.
  */
 function setupIntervalHandler(msec) {
+    intervalHandler();
     try {
         return setInterval(intervalHandler, msec);
     } catch(e) {
@@ -394,7 +418,7 @@ var geoposition = null;
 function locationHandler(pos) {
     try {
         geoposition = pos;
-        return getcompdata(geolocationcomp, compquery());
+        return getcompdata(locationcomp, compquery());
     } catch(e) {
         locationErrorHandler(e);
     }
@@ -431,7 +455,7 @@ function setupLocationHandler() {
 }
 
 // Load the app frame
-$('app').innerHTML = '<iframe id="appFrame" class="widgetFrame" src="app.html" onload="getpagedata()"></iframe>';
+$('appbuffer').innerHTML = '<iframe id="appFrame" class="widgetframe" src="app.html" onload="getpagedata()"></iframe>';
 
 </script>
 </body>
-- 
cgit v1.2.3

