Skip to content

Commit

Permalink
Merge branch 'staging' into l10n_staging
Browse files Browse the repository at this point in the history
  • Loading branch information
imolorhe committed Jan 29, 2020
2 parents 30d1a40 + 001eb45 commit 475bb23
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 14 deletions.
11 changes: 3 additions & 8 deletions .travis.yml
Expand Up @@ -8,14 +8,7 @@ osx_image: xcode11
node_js:
- 10
addons:
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
- google-chrome-beta
- fakeroot
- rpm
chrome: stable
services:
- xvfb
before_install:
Expand Down Expand Up @@ -55,12 +48,14 @@ deploy:
skip_cleanup: true
on:
branch: master
condition: $TRAVIS_OS_NAME = linux
- provider: surge
project: ./packages/altair-app/dist
domain: altair-gql-translate.surge.sh
skip_cleanup: true
on:
branch: staging
condition: $TRAVIS_OS_NAME = linux
- provider: snap
file_glob: true
snap: packages/altair-electron/out/**/*.snap
Expand Down
2 changes: 1 addition & 1 deletion bin/surge_deploy.sh
Expand Up @@ -5,7 +5,7 @@
REPO_SLUG_ARRAY=(${TRAVIS_REPO_SLUG//\// })
REPO_OWNER=${REPO_SLUG_ARRAY[0]}
REPO_NAME=${REPO_SLUG_ARRAY[1]}
DEPLOY_PATH=.packages/altair-app/dist
DEPLOY_PATH=./packages/altair-app/dist


DEPLOY_SUBDOMAIN_UNFORMATTED_LIST=()
Expand Down
11 changes: 6 additions & 5 deletions packages/altair-app/src/app/utils/codemirror/refresh-editor.ts
@@ -1,10 +1,11 @@
export const handleEditorRefresh = (cm: any) => {
if (cm) {
if (cm.display.wrapper.offsetHeight) {
if (cm.display.lastWrapHeight !== cm.display.wrapper.clientHeight) {
console.log('changes', cm);
cm.refresh();
setTimeout(() => {
if (cm && cm.display.wrapper.offsetHeight) {
if (cm.display.lastWrapHeight !== cm.display.wrapper.clientHeight) {
cm.refresh();
}
}
}
}, 50);
}
};

0 comments on commit 475bb23

Please sign in to comment.