Changeset 260 for Dev/branches/rest-dojo-ui/client/pages

Timestamp:

02/14/12 18:22:25 (13 years ago)

Author:

hendrikvanantwerpen

Message:

• Clear LoginDialog? on show (in case of re-show).
• Allow to link nodes/widgets to rft.ui.Page members with data-rft-attach-point attribute.
• Allow arguments to a page to be passed with data-rft-props argument. Content loader rft.content sets this argument on the top node of a loaded page.
• Have longer cookie-lifetime and update cookie when session is restored. Allow session restore in API and client code.
• Moved startup Javascript to rft/run.js.

Location:

Dev/branches/rest-dojo-ui/client/pages

Files:

• session.html (modified) (2 diffs)
• sessions.html (modified) (2 diffs)

Dev/branches/rest-dojo-ui/client/pages/session.html

@@ -1 +1 @@
 <div data-dojo-type="rft.ui.Page">
-    <script type="dojo/method" data-dojo-event="init" data-dojo-args="args">
+    <script type="dojo/method" data-dojo-event="init">
+        var that = this;
         require(['dojo/_base/json','dojo/dom','dojo/store/JsonRest','dojo/domReady!'],
             function(json,dom,JsonRest){
@@ -7 +8 @@
                     idProperty: 'uid'
                 });
-                store.get(args.uid).then(function(obj){
-                    dom.byId('page_session_form').innerHTML = json.toJson(obj);
+                store.get(that.args.uid).then(function(obj){
+                    that.page_session_form.innerHTML = json.toJson(obj);
                 });
             });
     </script>
-    <div class="largeFrame" id="page_session" style="width: 400px;">
+    <div class="largeFrame" style="width: 400px;">
         <div class="largeTitle">Session</div>
         <div class="content">
-            <div id="page_session_form"></div>
+            <div data-rft-attach-point="page_session_form"></div>
         </div>
     </div>

Dev/branches/rest-dojo-ui/client/pages/sessions.html

@@ -1 +1 @@
 <div data-dojo-type="rft.ui.Page">
-    <script type="dojo/method" data-dojo-event="init" data-dojo-args="args">
+    <script type="dojo/method" data-dojo-event="init">
+        var that = this;
         require(['dojo/store/JsonRest','dojox/grid/DataGrid',
             Â Â Â Â 'dojo/data/ObjectStore','dojo/domReady!'],
@@ -8 +9 @@
                 idProperty: 'uid'
             });
-            Â Â Â Â var grid = new DataGrid({
-                Â Â Â Â Â Â Â Â store: ObjectStore({objectStore: store}),
+        Â Â Â Â var grid = new DataGrid({
+        Â Â Â Â Â Â Â Â store: ObjectStore({objectStore: store}),
                 autoWidth: true,
                 autoHeight: true,
-                Â Â Â Â Â Â Â Â structure: [
-                    Â Â Â Â Â Â Â Â Â Â Â Â {name:"Title", field:"title", width: "200px"},
-                    Â Â Â Â Â Â Â Â Â Â Â Â {name:"Id", field:"uid", width: "200px"}
-                Â Â Â Â Â Â Â Â ]
-            Â Â Â Â }, "page_sessions_grid");
-            Â Â Â Â grid.startup();
+        Â Â Â Â Â Â Â Â structure: [
+            Â Â Â Â Â Â Â Â Â Â Â Â {name:"Title", field:"title", width: "200px"}
+        Â Â Â Â Â Â Â Â ]
+        Â Â Â Â }, that.page_sessions_grid);
+        Â Â Â Â grid.startup();
         });
     </script>
-    <div class="largeFrame" id="page_sessions" style="width: 400px;">
+    <div class="largeFrame" style="width: 400px;">
         <div class="largeTitle">Sessions</div>
         <div class="content">
-            <div id="page_sessions_grid"></div>
+            <div data-rft-attach-point="page_sessions_grid"></div>
         </div>
     </div>