Skip to content

Bug/aside images #50

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.

Sign up for GitHub

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

Merged
urchykli merged 10 commits into from
May 14, 2021
Merged

Bug/aside images #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
28f2cd3
Removed $.trim from tinymce.js on insert function.
Jonathan-J-Choi May 7, 2021
156ba78
Updatepackage lock
urchykli May 7, 2021
4eed7a5
Remove node sass
urchykli May 7, 2021
2059627
Reinstall node sass
urchykli May 7, 2021
666f6f5
Remove cache npm from travis file as it's causing the build to error
urchykli May 7, 2021
de8c563
Install node-gyp
urchykli May 7, 2021
97f061f
Remove node-sass
urchykli May 7, 2021
ace2584
In travis file change npm ci to npm install
urchykli May 7, 2021
af69c74
Update package.json and run npm install
urchykli May 14, 2021
226ee95
Merge branch 'development' into bug/aside-images
urchykli May 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
language: node_js
node_js:
- "stable"
cache: npm
# cache: npm
branches:
only:
- master
- master
addons:
ssh_known_hosts: git.wpengine.com
before_script:
- npm ci
- npm install
script:
- npm run build
before_install:
- openssl aes-256-cbc -K $encrypted_0c3eeb54f1f2_key -iv $encrypted_0c3eeb54f1f2_iv -in beyond_parallel_rsa.enc -out /tmp/beyond_parallel_rsa -d
before_deploy:
- cd $TRAVIS_BUILD_DIR
- cd $TRAVIS_BUILD_DIR
deploy:
- provider: script
skip_cleanup: true
script: chmod +x deploy.sh && sh deploy.sh
on:
branch: master
- provider: script
skip_cleanup: true
script: chmod +x deploy.sh && sh deploy.sh
on:
branch: master
2 changes: 1 addition & 1 deletion wp-content/themes/beyond/js/tinymce.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
.first()
.toJSON();

if (0 > $.trim(json.url.length)) {
if (0 > json.url.length) {
return;
}

Expand Down