Merge pull request #160 from solid/dom-to-context

Making use of the new context object

Author: megoth

src/acl-control.js

@@ -66,7 +66,8 @@ UI.aclControl.shortNameForFolder = function (x) {
   return str || '/'
 }
 
-UI.aclControl.ACLControlBox5 = function (subject, dom, noun, kb, callback) {
+UI.aclControl.ACLControlBox5 = function (subject, context, noun, kb, callback) {
+  const dom = context.dom
   var updater = kb.updater || new $rdf.UpdateManager(kb)
   var ACL = UI.ns.acl
   var doc = subject.doc() // The ACL is actually to the doc describing the thing
@@ -603,9 +604,9 @@ UI.aclControl.ACLControlBox5 = function (subject, dom, noun, kb, callback) {
           'A Web App (origin)',
           async event => {
             removeOthers(event.target)
-            var context = { div: bar, dom }
-            await UI.authn.logInLoadProfile(context)
-            var trustedApps = kb.each(context.me, ns.acl('trustedApp'))
+            var eventContext = { div: bar, dom }
+            await UI.authn.logInLoadProfile(eventContext)
+            var trustedApps = kb.each(eventContext.me, ns.acl('trustedApp'))
             var trustedOrigins = trustedApps.flatMap(app =>
               kb.each(app, ns.acl('origin'))
             )
@@ -640,10 +641,12 @@ UI.aclControl.ACLControlBox5 = function (subject, dom, noun, kb, callback) {
             table.style = 'margin: em; background-color: #eee;'
 
             // Add the Trusted App pane for managing you set of apps
-            var trustedAppControl = window.panes.trustedApplications.render(
-              context.me,
-              dom,
-              {}
+            const trustedApplications = context.session.paneRegistry.byName(
+              'trustedApplications'
+            )
+            const trustedAppControl = trustedApplications.render(
+              eventContext.me,
+              context
             )
             trustedAppControl.style.borderColor = 'orange'
             trustedAppControl.style.borderWidth = '0.1em'

src/create.js

@@ -85,7 +85,7 @@ function newThingUI (context, thePanes) {
                 newPaneOptions.newBase
             )
             options.pane
-              .mintNew(newPaneOptions)
+              .mintNew(context, newPaneOptions)
               .then(function (newPaneOptions) {
                 if (!newPaneOptions || !newPaneOptions.newInstance) {
                   throw new Error('Cannot mint new - missing newInstance')

src/widgets/buttons.js

@@ -663,6 +663,7 @@ buttons.openHrefInOutlineMode = function (e) {
   if (!uri) return console.log('openHrefInOutlineMode: No href found!\n')
   const dom = window.document
   if (dom.outlineManager) {
+    // @@ TODO Remove the use of document as a global object
     dom.outlineManager.GotoSubject(
       UI.store.sym(uri),
       true,
@@ -671,6 +672,7 @@ buttons.openHrefInOutlineMode = function (e) {
       undefined
     )
   } else if (window && window.panes && window.panes.getOutliner) {
+    // @@ TODO Remove the use of window as a global object
     window.panes
       .getOutliner()
       .GotoSubject(UI.store.sym(uri), true, undefined, true, undefined)