made preview mode in page authoring sticky

headwirecom · Nov 28, 2017 · a242d34 · a242d34
1 parent 9593eb6
commit a242d34
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/admin-base/materialize/custom/_workspace.scss b/admin-base/materialize/custom/_workspace.scss
@@ -168,7 +168,7 @@
 				display: none;
 			}
 			#editview {
-				width: 100%;
+				//width: 100%;
 				position: fixed;
 				top: 112px;
 				padding-bottom: 112px;

diff --git a/admin-base/ui.apps/src/main/content/jcr_root/apps/admin/components/contentview/template.vue b/admin-base/ui.apps/src/main/content/jcr_root/apps/admin/components/contentview/template.vue
@@ -126,9 +126,9 @@ export default {
             return $perAdminApp.getNodeFromView('/pageView/path') + '.html'
         },
         viewMode: function() {
-            let viewMode = $perAdminApp.getNodeFromViewOrNull('/state/tools/workspace/view')
-            if(viewMode) return viewMode
-            return 'desktop'
+            const viewMode = $perAdminApp.getNodeFromViewOrNull('/state/tools/workspace/view')
+            const previewMode = $perAdminApp.getNodeFromViewOrNull('/state/tools/workspace/preview')
+            return viewMode ? viewMode: 'desktop' + ( previewMode ? ' ' + previewMode : '' )
         },
         viewModeClass: function() {
             return this.viewMode
@@ -199,7 +199,7 @@ export default {
 
         setIframeScrollState(viewMode) {
              var iframeDoc = this.$refs.editview.contentWindow.document
-            if(viewMode === 'preview'){
+            if(viewMode.endsWith('preview')){
                 iframeDoc.body.style.overflowX = 'hidden'
                 iframeDoc.body.style.overflowY = 'auto'
             } else {

diff --git a/admin-base/ui.apps/src/main/content/jcr_root/content/admin/pages/edit/.content.xml b/admin-base/ui.apps/src/main/content/jcr_root/content/admin/pages/edit/.content.xml
@@ -55,7 +55,7 @@
                              command="editPreview" icon="desktop_mac"/>
                     <preview jcr:primaryType="nt:unstructured"
                              sling:resourceType="admin/components/action" target="preview" type="icon" title="preview"
-                             stateFrom="/state/tools/workspace/view"
+                             stateFrom="/state/tools/workspace/preview"
                              command="editPreview" icon="visibility"/>
                 </subnav>
             </nav>

diff --git a/admin-base/ui.apps/src/main/js/stateActions/editPreview.js b/admin-base/ui.apps/src/main/js/stateActions/editPreview.js
@@ -32,6 +32,15 @@ export default function(me, target) {
     log.fine(target)
 
     let view = me.getView()
-    set(view, '/state/tools/workspace/view', target)
-    set(view, '/pageView/view', target)
+    if(target === 'preview') {
+        if(view.state.tools.workspace.preview === 'preview') {
+            set(view, '/state/tools/workspace/preview', '')
+            set(view, '/pageView/view', view.state.tools.workspace.view)
+        } else {
+            set(view, '/state/tools/workspace/preview', target)
+            set(view, '/pageView/view', target)
+        }
+    } else {
+        set(view, '/state/tools/workspace/view', target)
+    }
 }