-
Notifications
You must be signed in to change notification settings - Fork 80
Firefox support, tiling terminal, preview fix #478
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Kreijstal
wants to merge
3
commits into
pylonide:development
Choose a base branch
from
Kreijstal:feature/firefox-support-tiling-terminal
base: development
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -167,9 +167,17 @@ module.exports = ext.register($name, { | |||||||||||||||||||||||||||||||
| if (!button || !button.cache) | ||||||||||||||||||||||||||||||||
| return; | ||||||||||||||||||||||||||||||||
| var pNode = button.cache.$dockpage.$pHtmlNode; | ||||||||||||||||||||||||||||||||
| if (pNode.children.length === 4) { | ||||||||||||||||||||||||||||||||
| pNode.removeChild(pNode.children[2]); | ||||||||||||||||||||||||||||||||
| pNode.children[2].style.top = 0; | ||||||||||||||||||||||||||||||||
| // Find and hide the caption element by class instead of | ||||||||||||||||||||||||||||||||
| // removing by index, which could destroy the iframe. | ||||||||||||||||||||||||||||||||
| for (var i = 0; i < pNode.children.length; i++) { | ||||||||||||||||||||||||||||||||
| var child = pNode.children[i]; | ||||||||||||||||||||||||||||||||
| if (child.className && child.className.indexOf('docktab_page_caption') !== -1) { | ||||||||||||||||||||||||||||||||
| child.style.display = 'none'; | ||||||||||||||||||||||||||||||||
| // Expand the content area below to fill the space | ||||||||||||||||||||||||||||||||
| var next = pNode.children[i + 1]; | ||||||||||||||||||||||||||||||||
| if (next) next.style.top = '0'; | ||||||||||||||||||||||||||||||||
| break; | ||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||
| }, | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
|
|
@@ -182,10 +190,10 @@ module.exports = ext.register($name, { | |||||||||||||||||||||||||||||||
| })[0]; | ||||||||||||||||||||||||||||||||
| if (page) | ||||||||||||||||||||||||||||||||
| this.live.value = page.$doc.getValue(); | ||||||||||||||||||||||||||||||||
| var iframe = this.getIframe().$ext; | ||||||||||||||||||||||||||||||||
| if (!iframe || !iframe.contentWindow) | ||||||||||||||||||||||||||||||||
| var frm = this.getIframe(); | ||||||||||||||||||||||||||||||||
| if (!frm || !frm.$browser || !frm.$browser.contentWindow) | ||||||||||||||||||||||||||||||||
| return; | ||||||||||||||||||||||||||||||||
| var html = iframe.contentWindow.document.getElementsByTagName("html")[0]; | ||||||||||||||||||||||||||||||||
| var html = frm.$browser.contentWindow.document.getElementsByTagName("html")[0]; | ||||||||||||||||||||||||||||||||
| html.innerHTML = this.live.value; | ||||||||||||||||||||||||||||||||
| }, | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
|
|
@@ -195,8 +203,8 @@ module.exports = ext.register($name, { | |||||||||||||||||||||||||||||||
| dock.expandBar(bar); | ||||||||||||||||||||||||||||||||
| dock.showSection(this.$name, this.$button); | ||||||||||||||||||||||||||||||||
| this.hidePageHeader(); | ||||||||||||||||||||||||||||||||
| var frmPreview = this.getIframe(); | ||||||||||||||||||||||||||||||||
| if (frmPreview.$ext.src !== url) | ||||||||||||||||||||||||||||||||
| var frm = this.getIframe(); | ||||||||||||||||||||||||||||||||
| if (frm && frm.$browser && frm.$browser.src !== url) | ||||||||||||||||||||||||||||||||
| this.refresh(url); | ||||||||||||||||||||||||||||||||
| this.live = live; | ||||||||||||||||||||||||||||||||
| }, | ||||||||||||||||||||||||||||||||
|
|
@@ -207,9 +215,10 @@ module.exports = ext.register($name, { | |||||||||||||||||||||||||||||||
| }, | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| refresh: function (url) { | ||||||||||||||||||||||||||||||||
| var frmPreview = this.getIframe(); | ||||||||||||||||||||||||||||||||
| var frm = this.getIframe(); | ||||||||||||||||||||||||||||||||
| if (!frm) return; | ||||||||||||||||||||||||||||||||
| url = url || txtPreview.getValue(); | ||||||||||||||||||||||||||||||||
| frmPreview.$ext.src = url; | ||||||||||||||||||||||||||||||||
| frm.$browser.src = url; | ||||||||||||||||||||||||||||||||
| txtPreview.setValue(url); | ||||||||||||||||||||||||||||||||
| settings.save(); | ||||||||||||||||||||||||||||||||
| }, | ||||||||||||||||||||||||||||||||
|
|
@@ -222,10 +231,45 @@ module.exports = ext.register($name, { | |||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| init: function() { | ||||||||||||||||||||||||||||||||
| ppc.importCssString(this.css || ""); | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| // Size the browser iframe to fill the page below the toolbar. | ||||||||||||||||||||||||||||||||
| // PPC page elements don't support flexbox so we calculate | ||||||||||||||||||||||||||||||||
| // the height dynamically based on the docktab container. | ||||||||||||||||||||||||||||||||
| var fixSize = function() { | ||||||||||||||||||||||||||||||||
| if (typeof frmPreview === 'undefined' || !frmPreview.$ext || | ||||||||||||||||||||||||||||||||
| typeof pgPreview === 'undefined' || !pgPreview.$ext) { | ||||||||||||||||||||||||||||||||
| setTimeout(fixSize, 200); | ||||||||||||||||||||||||||||||||
| return; | ||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| var iframe = frmPreview.$ext; | ||||||||||||||||||||||||||||||||
|
Comment on lines
+239
to
+245
|
||||||||||||||||||||||||||||||||
| if (typeof frmPreview === 'undefined' || !frmPreview.$ext || | |
| typeof pgPreview === 'undefined' || !pgPreview.$ext) { | |
| setTimeout(fixSize, 200); | |
| return; | |
| } | |
| var iframe = frmPreview.$ext; | |
| if (typeof frmPreview === 'undefined' || | |
| (!frmPreview.$browser && !frmPreview.$ext) || | |
| typeof pgPreview === 'undefined' || !pgPreview.$ext) { | |
| setTimeout(fixSize, 200); | |
| return; | |
| } | |
| var iframe = frmPreview.$browser || frmPreview.$ext; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In
refresh(),frmis checked for null butfrm.$browseris not; ifrefresh()runs before the<a:browser>element finishes drawing, this will throw. Mirror the defensive checks used inonFileSave()/preview()by verifyingfrm.$browserexists before assigningsrc.