diff --git a/assets/apps/sandbox/sandbox.js b/assets/apps/sandbox/sandbox.js index 837c0ced..35e26d0a 100644 --- a/assets/apps/sandbox/sandbox.js +++ b/assets/apps/sandbox/sandbox.js @@ -1,8 +1,6 @@ var mainWindow; var origin; var streamWriter; -var currentPath = ''; -var currentTitle = ''; let msgHandler = function (e) { // You must verify that the origin of the message's sender matches your // expectations. In this case, we're only planning on accepting messages @@ -14,17 +12,6 @@ let msgHandler = function (e) { return; mainWindow = e.source; origin = e.origin; - - let appIFrame = document.getElementById("appSandboxId"); - if (appIFrame != null && appIFrame.contentDocument != null) { - let path = appIFrame.contentDocument.location.pathname; - let title = appIFrame.contentDocument.title; - if (path != null && path != currentPath) { - currentTitle = title; - currentPath = path; - } - } - if (e.data.type == "ping") { mainWindow.postMessage({action:'pong'}, e.origin); } else if (e.data.type == "init") { @@ -32,8 +19,6 @@ let msgHandler = function (e) { e.data.username, e.data.props); } else if(e.data.type == "respondToLoadedChunk") { respondToLoadedChunk(e.data.bytes); - } else if(e.data.type == "currentTitleRequest") { - currentTitleRequest(e); } }; function resizeHandler() { @@ -55,9 +40,6 @@ function actionRequest(filePath, requestId, api, apiMethod, bytes, hasFormData, mainWindow.postMessage({action:'actionRequest', requestId: requestId, filePath: filePath, api: api, apiMethod: apiMethod, bytes: bytes, hasFormData: hasFormData, params: params, isFromRedirect: isFromRedirect, isNavigate: isNavigate}, origin); } -function currentTitleRequest(e) { - e.source.postMessage({action:'currentTitleResponse', path: currentPath, title: currentTitle}, e.origin); -} function load(appName, appPath, allowBrowsing, theme, chatId, username, props) { let that = this; let iframe = document.getElementById("appSandboxId"); diff --git a/assets/images/bookmark-o.svg b/assets/images/bookmark-o.svg new file mode 100644 index 00000000..28a9973d --- /dev/null +++ b/assets/images/bookmark-o.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/assets/images/bookmark.svg b/assets/images/bookmark.svg new file mode 100644 index 00000000..a43e59ea --- /dev/null +++ b/assets/images/bookmark.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/components/sandbox/AppSandbox.vue b/src/components/sandbox/AppSandbox.vue index 78d43e61..3318c6ee 100644 --- a/src/components/sandbox/AppSandbox.vue +++ b/src/components/sandbox/AppSandbox.vue @@ -77,8 +77,12 @@

{{ getFullPathForDisplay() }} - - + + + + + +

@@ -239,6 +243,7 @@ module.exports = { confirm_body: "", confirm_consumer_cancel_func: () => {}, confirm_consumer_func: () => {}, + displayToBookmark: true, } }, computed: { @@ -248,7 +253,8 @@ module.exports = { 'context', "sandboxedApps", 'mirrorBatId', - "socialData" + "socialData", + "shortcuts" ]), ...Vuex.mapGetters([ 'isSecretLink', @@ -313,7 +319,7 @@ module.exports = { that.appRegisteredWithFileAssociation = that.appHasFileAssociation(that.currentProps); that.appRegisteredWithWildcardFileAssociation = that.appHasWildcardFileRegistration(that.currentProps); } - that.startListener(); + that.start(); }); } else { this.loadAppProperties().thenApply(props => { @@ -345,7 +351,7 @@ module.exports = { that.clientMailboxAddress = clientAddress.ref.toLowerCase(); that.getMailboxPropertiesFile().thenApply(props => { that.mailboxClientProperties = props; - that.startListener(); + that.start(); }); } }); @@ -353,7 +359,7 @@ module.exports = { } }); } else { - that.startListener(); + that.start(); } }); }); @@ -487,11 +493,6 @@ module.exports = { extractWorkspace: function(path) { return path.substring(1, path.indexOf('/', 1)); }, - startTitleDetection: function() { - if (!this.running) return; - this.postMessage({type: 'currentTitleRequest'}); - setTimeout(() => this.startTitleDetection(), 300); - }, loadAppProperties: function(appFolderLocation) { let that = this; var future = peergos.shared.util.Futures.incomplete(); @@ -504,11 +505,6 @@ module.exports = { } return future; }, - currentTitleResponse: function(fullPath, title) { - if (fullPath != "blank") { - this.setFullPathForDisplay(fullPath); - } - }, getFullPathForDisplay: function() { let pathToDisplay = this.fullPathForDisplay; if (pathToDisplay.length > 0 && this.browserMode && !this.isMobile) { @@ -516,8 +512,59 @@ module.exports = { } return pathToDisplay; }, - setFullPathForDisplay: function(path) { - this.fullPathForDisplay = path; + toggleBookmark: function(remove) { + if(this.showSpinner || this.isSecretLink) { + return; + } + let that = this; + let address = this.fullPathForDisplay; + if (address.length <= 1) { + return; + } + let bookmark = this.shortcuts.shortcutsMap.get(address); + let fileCreatedDate = new Date(this.targetFile.getFileProperties().created.toString() + "+00:00") + if (remove) { + if (bookmark != null) { + this.refreshAndDeleteBookmark(address); + } + } else { + if (bookmark == null) { + this.refreshAndAddBookmark(address, fileCreatedDate); + } + } + }, + refreshAndAddBookmark(link, created) { + let that = this; + this.showSpinner = true; + this.loadShortcutsFile(this.launcherApp).thenApply(shortcutsMap => { + if (shortcutsMap.get(link) == null) { + let entry = {added: new Date(), created: created}; + shortcutsMap.set(link, entry) + that.updateShortcutsFile(that.launcherApp, shortcutsMap).thenApply(res => { + that.showSpinner = false; + that.displayToBookmark = false; + that.$store.commit("SET_SHORTCUTS", shortcutsMap); + }); + } else { + that.showSpinner = false; + } + }) + }, + refreshAndDeleteBookmark(link) { + let that = this; + this.showSpinner = true; + this.loadShortcutsFile(this.launcherApp).thenApply(shortcutsMap => { + if (shortcutsMap.get(link) != null) { + shortcutsMap.delete(link) + that.updateShortcutsFile(that.launcherApp, shortcutsMap).thenApply(res => { + that.showSpinner = false; + that.displayToBookmark = true; + that.$store.commit("SET_SHORTCUTS", shortcutsMap); + }); + } else { + that.showSpinner = false; + } + }) }, validatePermissions: function(props) { let allPermissions = new Map(); @@ -606,12 +653,17 @@ module.exports = { } else if(e.data.action == 'actionRequest') { that.actionRequest(e.data.filePath, e.data.requestId, e.data.api, e.data.apiMethod, e.data.bytes, e.data.hasFormData, e.data.params, e.data.isFromRedirect, e.data.isNavigate); - } else if(e.data.action == 'currentTitleResponse') { - that.currentTitleResponse(e.data.path, e.data.title); } } } }, + start: function() { + let that = this; + peergos.shared.user.App.init(this.context, "launcher").thenApply(launcher => { + that.launcherApp = launcher; + that.startListener(); + }); + }, startListener: function() { var that = this; var iframeContainer = document.getElementById("sandbox-container"); @@ -826,7 +878,7 @@ module.exports = { that.showError("App attempted to access file without permission :" + path); that.buildResponse(headerFunc(), null, that.ACTION_FAILED); } else { - that.readFileOrFolder(headerFunc, '/data/' + path, params, true); + that.readFileOrFolder(headerFunc, '/data/' + path, params, true, false); } } else { let prefix = !this.browserMode @@ -838,7 +890,7 @@ module.exports = { if (this.browserMode) { that.handleBrowserRequest(headerFunc, path, params, isFromRedirect, isNavigate); } else { - that.readFileOrFolder(headerFunc, prefix + path, params); + that.readFileOrFolder(headerFunc, prefix + path, params, false, false); } } } else { @@ -2921,10 +2973,11 @@ module.exports = { }); } else { if (isNavigate) { + that.fullPathForDisplay = path; if (!that.running) { that.running = true; - that.startTitleDetection(); - that.readFileOrFolder(headerFunc, path, params); + that.setBookmarkIcon(); + that.readFileOrFolder(headerFunc, path, params, false, false); } else { let fullPath = that.expandFilePath(path, isFromRedirect); var app = that.getApp(file, fullPath); @@ -2936,24 +2989,32 @@ module.exports = { } // If we are navigating to an 'external' link, use a new context on a different subdomain if (app == 'htmlviewer' && that.extractWorkspace(fullPath) == that.workspaceName) { - that.readFileOrFolder(headerFunc, path, params); + that.setBookmarkIcon(); + that.readFileOrFolder(headerFunc, path, params, false, true); } else { that.closeAndLaunchApp(headerFunc, app, navigationPath, navigationFilename); } } } else { - that.readFileOrFolder(headerFunc, path, params); + that.readFileOrFolder(headerFunc, path, params, false, false); } } } }); }, + setBookmarkIcon: function() { + if (this.shortcuts.shortcutsMap.get(this.fullPathForDisplay) == null) { + this.displayToBookmark = true; + } else { + this.displayToBookmark = false; + } + }, closeAndLaunchApp: function(headerFunc, app, path, filename) { this.buildResponse(headerFunc(), null, this.NAVIGATE_TO); this.navigateTo = { app: app, navigationPath: path, navigationFilename: filename}; this.closeSandbox(); }, - readFileOrFolder: function(headerFunc, path, params, ignoreHiddenFolderCheck) { + readFileOrFolder: function(headerFunc, path, params, ignoreHiddenFolderCheck, updateTargetFile) { let that = this; let expandedFilePath = this.expandFilePath(path); if (this.browserMode && expandedFilePath.includes('/.')) { @@ -2990,6 +3051,9 @@ module.exports = { that.buildResponse(headerFunc(), null, that.ACTION_FAILED); } } else { + if (updateTargetFile) { + that.targetFile = resp; + } that.readInFile(headerFunc, resp); } } diff --git a/src/components/viewers/Markup.vue b/src/components/viewers/Markup.vue index d281fdf5..815c1469 100644 --- a/src/components/viewers/Markup.vue +++ b/src/components/viewers/Markup.vue @@ -3,7 +3,14 @@
-

{{ getFullPathForDisplay() }}

+
+

{{ getFullPathForDisplay() }} + + + + +

+
× @@ -72,14 +79,18 @@ module.exports = { confirm_message: "", confirm_body: "", confirm_consumer_cancel_func: () => {}, - confirm_consumer_func: () => {} + confirm_consumer_func: () => {}, + launcherApp: null, + displayToBookmark: true, + targetFile: null, } }, props: ['propAppArgs'], mixins:[mixins, routerMixins, launcherMixin], computed: { ...Vuex.mapState([ - 'context' + 'context', + "shortcuts", ]), ...Vuex.mapGetters([ 'isSecretLink' @@ -112,7 +123,7 @@ module.exports = { that.isFileWritable = file.isWritable(); that.readInFile(file).thenApply(data => { that.setFullPathForDisplay(); - + that.targetFile = file; let theme = that.$store.getters.currentTheme; let subPath = that.propAppArgs.subPath != null ? that.propAppArgs.subPath : that.scopedPath.substring(0, that.scopedPath.length -1); @@ -153,6 +164,7 @@ module.exports = { if (file != null) { that.readInFile(file).thenApply(data => { that.setFullPathForDisplay(); + that.targetFile = file; let func = function(iframe) { iframe.contentWindow.postMessage({action: "respondToNavigateTo", theme: theme, text:new TextDecoder().decode(data) , extension: extension, subPath: subPath}, '*'); @@ -199,7 +211,8 @@ module.exports = { } this.isIframeInitialised = false; let that = this; - Vue.nextTick(function() { + peergos.shared.user.App.init(this.context, "launcher").thenApply(launcher => { + that.launcherApp = launcher; that.startListener(func); }); }, @@ -224,7 +237,60 @@ module.exports = { }, 1000 * 10); }); }, - + toggleBookmark: function(remove) { + if(this.showSpinner || this.isSecretLink) { + return; + } + let that = this; + let address = this.fullPathForDisplay; + if (address.length <= 1) { + return; + } + let bookmark = this.shortcuts.shortcutsMap.get(address); + let fileCreatedDate = new Date(this.targetFile.getFileProperties().created.toString() + "+00:00") + if (remove) { + if (bookmark != null) { + this.refreshAndDeleteBookmark(address); + } + } else { + if (bookmark == null) { + this.refreshAndAddBookmark(address, fileCreatedDate); + } + } + }, + refreshAndAddBookmark(link, created) { + let that = this; + this.showSpinner = true; + this.loadShortcutsFile(this.launcherApp).thenApply(shortcutsMap => { + if (shortcutsMap.get(link) == null) { + let entry = {added: new Date(), created: created}; + shortcutsMap.set(link, entry) + that.updateShortcutsFile(that.launcherApp, shortcutsMap).thenApply(res => { + that.showSpinner = false; + that.displayToBookmark = false; + that.$store.commit("SET_SHORTCUTS", shortcutsMap); + }); + } else { + that.showSpinner = false; + } + }) + }, + refreshAndDeleteBookmark(link) { + let that = this; + this.showSpinner = true; + this.loadShortcutsFile(this.launcherApp).thenApply(shortcutsMap => { + if (shortcutsMap.get(link) != null) { + shortcutsMap.delete(link) + that.updateShortcutsFile(that.launcherApp, shortcutsMap).thenApply(res => { + that.showSpinner = false; + that.displayToBookmark = true; + that.$store.commit("SET_SHORTCUTS", shortcutsMap); + }); + } else { + that.showSpinner = false; + } + }) + }, setupIFrameMessaging: function(iframe, func) { if (this.isIframeInitialised) { func(iframe); @@ -239,6 +305,11 @@ module.exports = { }, setFullPathForDisplay: function() { this.fullPathForDisplay = this.currPath + '/' + this.currFilename; + if (this.shortcuts.shortcutsMap.get(this.fullPathForDisplay) == null) { + this.displayToBookmark = true; + } else { + this.displayToBookmark = false; + } }, showMessage: function(isError, title, body) { let bodyContents = body == null ? '' : ' ' + body;