Cassie Tarakajian
18239eb2e0
fixes #1065 , checks if cmController.getContent is defined ( #1071 )
2019-05-10 18:26:48 -04:00
Cassie Tarakajian
d4cdd1b790
fixes #1061 , sets selected file if it gets unset ( #1066 )
2019-05-06 14:50:28 -04:00
Ziyao Wei
10403a7f59
Fix race condition that's causing preview/console and code to be out of sync ( #990 ) ( #1031 )
...
* Fix race condition that's causing preview/console and code to be out of sync (#990 )
* Refactor
* Fix undefined prop error
2019-05-02 15:30:56 -04:00
siddhant
538a41c617
Added Loader to indicate loading of sketches ( #880 )
...
* Added Loader to indicate loading of sketches
* Fixed styles
* Changed styles
* remove prefixes
* Issues Fixed:
* added Loader
* Refactor
* Issues Fixed
* clean up loader functions
2019-05-01 16:32:39 -04:00
Cassie Tarakajian
9d22c3c146
fixes #1057 , fullscreen wasn't rendering because clearConsole was not defined ( #1058 )
2019-05-01 15:31:55 -04:00
Abhishek Kumar
76e4363705
Dialog fixes ( #1043 )
...
* Dialog fixes
* Dialog Alignmet Fixed
2019-05-01 14:17:55 -04:00
Ankur Ingale
07b55d7ee4
Fixed Issue #896 ( #1049 )
2019-04-30 17:44:41 -04:00
Nimish Agrawal
705dd5c796
Focus on find input ( #1044 )
2019-04-30 17:24:41 -04:00
Cassie Tarakajian
8b296a51aa
Fixes #1052 , in which you can't save a sketch after uploading a file ( #1053 )
...
Fixes #1052 , in which a user can't save a sketch after uploading a file
2019-04-24 13:32:23 -04:00
Cassie Tarakajian
c3de0512cc
fixes #1005 , squashed commits from @plxity and @catarak
2019-04-17 17:05:55 -04:00
Cassie Tarakajian
a4e2ce178d
fixes #1040 ( #1042 )
2019-04-17 16:51:58 -04:00
Apoorv Taneja
ac188eb6d9
fixed ( #958 )
2019-04-17 15:30:50 -04:00
Cassie Tarakajian
7d1901649f
Project synching, for #790 ( #1039 )
...
* add isSaving to project reducer, move actions to functions, start work to get comprehensive frontend/backend syncing working
* handle making changes while saving project, handle saving from another window
* add change to handle saving new sketch, and adding new changes while saving
2019-04-17 14:08:33 -04:00
Ankur Ingale
94eb6f1ac9
Fixed Issue #978 ( #1015 )
...
* Fixed Issue #978
* Added more keywords
2019-04-12 12:59:06 -04:00
Cassie Tarakajian
5abf4c4e06
fixes #1026 ( #1028 )
2019-04-11 16:25:37 -04:00
Cassie Tarakajian
61d6e13c78
fixes #1018 ( #1019 )
2019-04-05 17:14:00 -04:00
Cassie Tarakajian
cdb4e0687e
remove accessible options from nav for #768
2019-04-03 14:29:58 -04:00
Cassie Tarakajian
6d998d5f73
Merge branch 'master' into master
2019-04-03 11:38:39 -04:00
siddhant
7ef34e8f59
Since uploader was not present in the imports , the styles were not showin up ( #946 )
...
* fixed styles not showing up
* Added theme support
* Fixed Styles
* Fixed styles
* Refactor
2019-04-02 15:10:49 -04:00
progfay
276f115d3f
set default theme value (light) ( #1001 )
2019-03-28 16:53:22 -04:00
Apoorv Taneja
391a92a1fd
Logo color changes with theme. Fix #916 ( #997 )
...
* color changes with theme
* color changes with theme
* color changes with theme
* color changes with theme
2019-03-28 14:21:43 -04:00
Marton Soos
3bf3fe1452
Fix multiple file options showing up ( #987 ) ( #988 )
...
* Fix multiple file options showing up (#987 )
This change ensures that the file options composite widget is
hidden if and only if none of its components is in focus. This
is achieved by having a variable keep track of the state of
the composite widget (in focus / not in focus).
* Fix #987
Modified fix for #987 according to the requested changes.
Moved isFocused to the components state and created a method
for hadling the function calls executed in onBlur.
* Fix #987 - final touches
Renamed method blurComponent to onBlurComponent. Moved duplicated
code from onFocus callback to a new method called onFocusComponent.
2019-03-27 15:52:57 -04:00
siddhant
9433d188fc
Added autoOpen items on hover ( #900 )
...
* AutoOpen Header
* removed nav heading
* Fixed #908
* Fixed Styles
* Fixed styles
* Refactor editor
* Issues Fixed
* keyup -> keyown
2019-03-27 12:50:55 -04:00
Cassie Tarakajian
c1ba5cb072
revert overlay max-height
2019-03-26 15:51:55 -04:00
Cassie Tarakajian
2d77ddb650
Merge branch 'master' into feature/remove-indentation-options
2019-03-26 15:38:58 -04:00
Laksh Singla
24302b56de
Added softwrap preference for users. ( #970 )
...
* Client and server side code added for Linewrap option
* Linked linewrap prop with the Editor.jsx property
* linewrap defaults to true
* Renamed 'LineWrap' to 'WordWrap'
2019-03-26 15:37:44 -04:00
Pranav Tharoor
92c4c9a30f
Fixes issue with drop-down arrow not being clickable ( #982 )
2019-03-26 13:38:19 -04:00
nik72619c
ec00f32a5b
added requested changes
2019-03-26 21:30:43 +05:30
cdr
49e786a82d
Use more straightforward tab keymap function
2019-03-26 02:12:42 -04:00
cdr
20be8eb5bd
Fix tab indentation setting
2019-03-23 20:53:07 -04:00
cdr
d1ce054abf
Remove indentation config from actions, reducers, and constants
2019-03-21 21:08:59 -04:00
cdr
ddb93e6c8d
Remove indentation PropTypes from IDEView.jsx
2019-03-21 21:02:22 -04:00
cdr
096f8a1f65
Hardcode 2-space configuration in Editor.jsx
2019-03-21 20:52:56 -04:00
cdr
679ef12b54
Remove indentation options from Preferences.jsx
2019-03-21 20:26:52 -04:00
Ankur Ingale
80765e03c7
Fixed Issue #659 ( #964 )
...
* Fixed Issue #659
* Undo changes in package.json and package-lock.json
* Resolved error
2019-03-21 17:08:46 -04:00
Gaurang Tandon
2c876cda45
fixes #906 ( #931 )
2019-03-20 17:53:03 -04:00
siddhant
98d7933dee
Added length cap to sketch name ( #944 )
2019-03-20 16:32:01 -04:00
Gaurang Tandon
1b468aa4ec
fixes #795 ( #935 )
...
* fixes #795
* fix lint
2019-03-20 14:28:15 -04:00
Abhishek Kumar
e2a6b4595b
CSS Fixes ( #920 )
2019-03-20 12:52:00 -04:00
Abhishek Kumar
0eea37e72a
Fixing Spelling Mistake ( #913 )
...
* Fixing typos
* Fixed Spellings
2019-03-20 12:43:38 -04:00
nik72619c
0095e96c62
Merge branch 'master' of https://github.com/processing/p5.js-web-editor
2019-03-17 23:44:27 +05:30
Nikhil Sharma
52291c69f2
fixed non-optimal function declarations
2019-03-17 14:49:45 +05:30
Apoorv Taneja
3d248a0573
fixed password length ( #901 )
2019-03-15 17:35:48 -04:00
Nimish Agrawal
f8ee62a1b5
Removes scrollbar when not needed ( #892 )
2019-03-15 13:00:29 -04:00
Cassie Tarakajian
1d2cb87c33
for #874 , also fixes bug in which file options could be revealed by right clicking even if user isn't owner of sketch
2019-03-14 16:10:50 -04:00
nimish
a018929489
Remove file menu on blur
2019-03-13 18:10:47 +05:30
Nimish Agrawal
87c012b9f6
Autofocus on Add File menu ( #882 )
2019-03-12 16:17:27 -04:00
Cassie Tarakajian
d9670f7bc3
fixes #865 ( #869 )
2019-03-05 16:25:34 -05:00
Cassie Tarakajian
d17364a2ce
pull vendor css from node_modules, remove duplicate vendor css from client/styles/vendor
2019-03-04 15:38:14 -05:00
siddhant1
b6e2c4c983
Migrated from momentjs to date-fns
2019-03-02 15:05:40 +05:30
Oliver Wright
e37926de74
Refactor Toolbar Props - See #824 ( #849 )
2019-03-01 16:21:00 -05:00
Cassie Tarakajian
74ec1ba5bf
fixes #725 by updating jshint ( #848 )
2019-02-25 16:52:07 -05:00
Cassie Tarakajian
2cc0d578fb
for #790 , when saving a sketch, pull from codemirror window ( #847 )
...
* for #790 , when saving a sketch, pull from codemirror window
* fix lint errors
2019-02-25 16:45:20 -05:00
Oliver Wright
61f20d1d4c
Refactor Nav Props - See #824 ( #846 )
2019-02-25 15:11:07 -05:00
Oliver Wright
5fdcd08add
Use File id in Redux Actions - Fixes #842 ( #844 )
...
Prevents file name collisions that are possible with the folder
system.
2019-02-25 12:57:10 -05:00
Cassie Tarakajian
f1b6aab749
fixes #826
2019-02-20 16:03:18 -05:00
Oliver Wright
d0832ea4b7
Prevent crash when console.error is used - Fixes #833 ( #834 )
2019-02-20 15:57:37 -05:00
Oliver Wright
e8639a6ed0
Update snapshot
2019-02-10 01:00:24 +00:00
Oliver Wright
1df469bdeb
Update test
2019-02-10 01:00:20 +00:00
Sepand Ansari
189cc586c6
Add jest snapshot testing to Nav.jsx
2019-01-25 17:26:56 -05:00
Sepand Ansari
e1ef323e9b
Add jest/enzyme and a simple unit test
2019-01-25 17:21:10 -05:00
Laksh Singla
772a7c9370
Updated client/utils/javascript.js
to reflect changes in the CodeMirror's repository ( #805 )
...
* Updated client/utils/p5-javascript.js to reflect the latest one in CodeMirror's repository
* Template string bug fixed (#773 )
2019-01-25 15:43:01 -05:00
Francis Li
31abeb9455
Serve up an empty 404 page if no examples user ( #766 )
...
* Rebase/squash
* Fix 404 page showing when refreshing Examples list
* Fix linter error
* Revert special-case handling of the p5 user for examples
* Add additional env var for enabling/disabling examples
2019-01-25 14:12:39 -05:00
Cassie Tarakajian
7bd016bac3
fixes #785 , update node, and everything else that comes along with that ( #810 )
2019-01-16 17:56:18 -05:00
Cassie Tarakajian
437ffba378
fixes #802 ( #809 )
2019-01-16 12:35:34 -05:00
Peter Blazejewicz
fe950192e7
Fix ESLint errors ( #793 )
...
This fixes failing `npm run lint`:
- fixes `max-len` issue in code by reformat of the expression
- exempt ES6 template literals from `max-len` rule using ESLint
configuration change
Thanks!
2019-01-08 17:38:02 -05:00
Cassie Tarakajian
244af16b64
For #675 , needs more testing to know if it fixes it! ( #784 )
...
* for #675
* fix linting errors
2018-12-13 17:06:34 -05:00
Cassie Tarakajian
eebe9d9252
fixes #777 ( #782 )
2018-12-12 14:43:28 -05:00
Francis Li
9fe34504e9
Disable login/save ( #778 )
2018-12-11 16:21:37 -05:00
Cassie Tarakajian
b68e3a79fd
for #687
2018-11-26 18:08:24 -05:00
Cassie Tarakajian
5c83d14b63
fix for #769
2018-11-26 17:45:01 -05:00
Cassie Tarakajian
ef98190e25
for #769
2018-11-20 18:00:54 -05:00
Cassie Tarakajian
d5f2380c31
for #761 , fix lint error
2018-11-15 17:28:43 -05:00
Cassie Tarakajian
b70d62164c
for #761 , add source back to console messages
2018-11-15 17:19:50 -05:00
Cassie Tarakajian
00ea3bc281
Revert "Revert "for #761 , fix linting errors""
...
This reverts commit ef7231fe03
.
2018-11-15 16:41:10 -05:00
Cassie Tarakajian
28d7947910
Revert "Revert "fixes #761 , but fixes the bigger issue at hand here, which is that log messages were not getting deserialized properly""
...
This reverts commit f1bc7293ce
.
2018-11-15 16:40:37 -05:00
Cassie Tarakajian
f1bc7293ce
Revert "fixes #761 , but fixes the bigger issue at hand here, which is that log messages were not getting deserialized properly"
...
This reverts commit 661a367b72
.
2018-11-15 15:55:02 -05:00
Cassie Tarakajian
ef7231fe03
Revert "for #761 , fix linting errors"
...
This reverts commit 8952d760d0
.
2018-11-15 15:54:31 -05:00
Cassie Tarakajian
8952d760d0
for #761 , fix linting errors
2018-11-15 14:43:36 -05:00
Laksh Singla
9105249c23
Add New File and New Folder buttons in Navbar (feature: #758 ) ( #763 )
...
* Add New File and New Folder buttons in Navbar (feature: #758 )
* Moved the Add File and Add Folder butons from File to Sketch (feature: #758 )
2018-11-15 14:37:44 -05:00
Cassie Tarakajian
661a367b72
fixes #761 , but fixes the bigger issue at hand here, which is that log messages were not getting deserialized properly
2018-11-15 14:26:31 -05:00
Cassie Tarakajian
0a8c7c5773
fixes #751
2018-11-07 15:07:06 -05:00
Bhawesh Bhansali
61dd0bb4d0
[WIP] Set min & max limits on font-size ( #716 )
...
* Set min & max limits on font-size
Disable the font-size setting button when extremum is reached.
References https://github.com/processing/p5.js-web-editor/issues/689
* handle case for user input to input field, also add min and max for indentation amount
2018-11-02 15:55:06 -04:00
Joey Lee
25bf5ad636
Removed Console.log in client/.../ Project.js to prevent logging user data to console fixes #749 ( #750 )
...
* replaced () with {} to fix implicit return error
* added first version of fetching generative-design examples
* ignore local testing files
* formatting
* updated examples-gg-latest
* updated examples-gg-latest.js
- data files not served via rawgit - hallelujah!
- added jquery
* updated p5 version
* refactoring and code cleanup
* added comment
* comment out link to svgFiles - unused
* moved commented code
* fixed conflicts
* linted examples-gg-latest
* removed console.log of response.data to prevent logging user data to console
* fixed linting error
2018-11-01 14:59:28 -04:00
anaplian
319e68ddb6
Fix async validation in signup form ( fixes #742 ) ( #746 )
2018-10-29 19:33:37 -04:00
Cassie Tarakajian
de74c0cac8
fixes #516 , sets console lines limit to 500
2018-10-25 18:04:18 -04:00
Cassie Tarakajian
5196a37807
fix linting error caused by 8b2133e
2018-10-23 16:14:27 -04:00
Cassie Tarakajian
8b2133ea99
fixes #740
2018-10-23 16:07:32 -04:00
Cassie Tarakajian
8baec106aa
revert for #684
2018-10-22 17:48:02 -04:00
Nitesh Sawant
121bf94007
fixes #726 ( #728 )
...
* fixes #726
* Disabled Sumit butto nif form is not touched & used tri function instead of replace
2018-10-22 15:41:35 -04:00
Basile Pesin
55dfd7e328
Fixed my scrollbar mistake ( #736 )
...
* Fixed my scrollbar mistake
* Really fixed it by introducing a slightly different class for the fullview frame
* Using classnames module
2018-10-22 14:59:08 -04:00
Cassie Tarakajian
f417ff4c90
for #684
2018-10-22 12:45:16 -04:00
Basile Pesin
996a1b988a
Fixes #692 ( #713 )
...
* Got the basis covered, now I need to style all this
* Corrected and upgraded Share window
* Changed the routes again, and set correct design
* Made some of the requested changes
* Removed PreviewFrame errors
* Redesigned Preview Header
* Corrected style of the FullView
* Corrected most of the css mistakes
* Corrected logo size
2018-10-18 14:10:37 -04:00
Cassie Tarakajian
474c843e8a
Merge branch 'bugfix/680-preview-dimensions' of https://github.com/bendman/p5.js-web-editor into bendman-bugfix/680-preview-dimensions
2018-10-17 15:27:57 -04:00
Cassie Tarakajian
dcf9f270c4
fix bug in foldgutter styling
2018-10-15 17:45:31 -04:00
Cassie Tarakajian
d15e5d0da5
fixes #715 in an extremely hacky way 🤷♀️ , fixes another error in which when changing the font size, linting highlighting was misaligned
2018-10-10 17:40:47 -04:00
Meru Patel
19bffe58cf
Fixes #712 ( #718 )
...
* added matchbrackets
* Added css for matching brackets
2018-10-08 13:14:59 -04:00
cdncat
e83654f6ad
Fixes #717 ( #720 )
...
* remove npm run lint warnings, fixes #717
* Update link for Code of Conduct in CONTRIBUTING.md
2018-10-05 15:35:31 -04:00
Bhawesh Bhansali
cf5cb1f6e9
components/Editor.jsx: Allow indentation on entering new line ( #710 )
...
indentUnit updated on settings->indentation amount change
Fixes https://github.com/processing/p5.js-web-editor/issues/700
2018-10-04 13:36:42 -04:00
Cassie Tarakajian
04191fbaab
fixes #551
2018-10-03 16:48:44 -04:00
Basile Pesin
4096a1c0ee
Corrected the logo problem by adding it to the static files ( #708 )
2018-10-02 21:03:33 -04:00
Cassie Tarakajian
3ecb6fb80f
Merge pull request #690 from Janglee123/master
...
[WIP]Fixes #677
2018-10-02 20:49:02 -04:00
Meru Patel
9f6ce5fa8d
alignment fix
2018-09-23 12:26:39 +05:30
Cassie Tarakajian
a1d2acbe9b
Merge branch 'master' into production-docker
2018-09-17 14:53:58 -04:00
Cassie Tarakajian
51116bf0d0
fixes #696 , update default p5.js to latest version
2018-09-17 14:53:46 -04:00
Meru Patel
a9de9690b2
css change
2018-09-17 20:44:00 +05:30
Meru Patel
de9749b892
lint fixes
2018-09-16 14:27:05 +05:30
Meru Patel
a8261350c9
perfectly aligned
2018-09-16 14:24:48 +05:30
Meru Patel
5a8d814228
css update
2018-09-16 14:15:40 +05:30
Meru Patel
c3a4d1263e
css update
2018-09-16 12:03:45 +05:30
Meru Patel
b8f858ae70
misaligned height and logged number size fix
2018-09-15 23:39:48 +05:30
Meru Patel
14d01ae01c
misaligned height and logged number size fix
2018-09-15 23:33:42 +05:30
Meru Patel
7777e25990
minor changes
2018-09-14 22:14:41 +05:30
Meru Patel
80d77a6860
scalable svg icons
2018-09-14 13:41:38 +05:30
Meru Patel
d3be437dce
size related changes
2018-09-13 23:44:58 +05:30
Meru Patel
b8f43dec78
variable added
2018-09-13 21:20:07 +05:30
Meru Patel
28e7425fb8
small error fix
2018-09-13 07:42:50 +05:30
Meru Patel
2f48413b08
explanation removed
2018-09-13 07:37:43 +05:30
Meru Patel
f2c32e89a6
variable name change
2018-09-13 07:30:19 +05:30
Meru Patel
c676fae7bf
lint error fix
2018-09-12 10:54:05 +05:30
Meru Patel
7a44cceb65
Fixes #677
2018-09-12 10:35:15 +05:30
Meru Patel
2475467dd0
Fixes #677
2018-09-12 10:30:29 +05:30
bendman
ffa4ac145a
Fixes #680 by adjusting canvas and iframe layout
...
- Set the preview canvas to `display:block` to remove vertical spacing
caused by the default value, which was making a full-height canvas cause
vertical scrolling, and the vertical scrollbar caused horizontal
scrolling
- Wrap the preview content in a container with `position:relative` and
no other visible content, so that the full-height iframe excludes the
height of the preview frame header, preventing it from going beyond the
height of the page
2018-09-08 11:50:39 -07:00
Cassie Tarakajian
d2c8140442
Merge branch 'master' into production-docker
2018-09-07 17:25:29 -04:00
Ben Duncan
3b1cd6782b
Fixes #682 by isolating preview pane layers ( #683 )
...
Restrict the z-index of the console (and any other preview panes) to the
context of the preview container, thereby preventing any internal
content from overlaying a modal. `z-index:0` is used as a more
browser-compliant form of `isolation:isolate` or `contain:paint` to
create an isolated stacking context.
2018-09-07 17:25:09 -04:00
Cassie Tarakajian
cea61a79f5
Merge branch 'master' into production-docker
2018-09-07 15:48:43 -04:00
Jared Donovan
2f21130e0d
Fix needs saving mark 2 - for #576 ( #658 )
...
* Comment out show/hide file options action creators.
* Comment out show/hide file options properties
* Comment out show/hide file options action definitions
* Comment out constants for show/hide options action types
* Comment out props for show/hide options and replace with component state.
* Comment out show/hide edit file name reducers.
* Comment out show/hide edit file name actions.
* comment out show/hide edit file name action types.
* Comment out show/edit file name props from IDEView component
* Replace show/hide edit filename props in FileNode component with local state
* Remove commented out code from previous changes for moving redux state back into component state.
* Add binding to this for new functions. And tidy up of code.
2018-09-07 15:48:25 -04:00
Cassie Tarakajian
7cb2847b94
fix error with undefined env S3_URL_BUCKER_BASE
2018-08-30 19:35:03 -04:00
Cassie Tarakajian
5e70d8bb86
Merge branch 'master' into production-docker
2018-08-29 15:06:59 -04:00
Cassie Tarakajian
4a2d6d3035
fixes #668
2018-08-29 15:06:41 -04:00
Cassie Tarakajian
2c09b082df
Merge branch 'master' into production-docker
2018-08-29 14:54:24 -04:00
Cassie Tarakajian
1451c3ff70
update p5.js version
2018-08-29 14:54:09 -04:00
Cassie Tarakajian
d44027c58e
for simplicity and security, remove redirect to HTTP and keep everything on HTTPS
2018-08-27 14:37:31 -04:00
Cassie Tarakajian
6705e4c3f8
load client-side environment variables at runtime
2018-08-24 17:41:23 -04:00
Cassie Tarakajian
ead709b256
fix linting error
2018-08-20 14:54:12 -04:00
Cassie Tarakajian
aeeeda23a2
fix #671 , change forum url
2018-08-20 12:26:21 -04:00
Luis Morales-Navarro
3e97360c82
Update name of table output ( #670 )
2018-08-10 14:09:55 -04:00
Liang Tang
bee02e01ab
bug fixes ( #666 )
2018-07-31 13:07:19 -04:00
Liang Tang
617f00653c
Improve current console ( #656 )
...
* init v2
* make replay work
* fix a failing scenary of react-frame
* fix some bugs
* delete/comment some files
* remove
* fix some bugs && remove more comments
* remove unnecessary lines
* minor tweak
* fix some bugs
* try to hook iframe using webpack
* update
* changes according to cassie
* minor tweak
* fix lint
* extract sass
* add icons
* update webpack config
* update webpack configuration
* update
* tweak
* fix a small bug
2018-07-30 12:20:57 -04:00
Cassie Tarakajian
9958619fc4
fixes #630 and updates codemirror
2018-05-30 15:23:32 -07:00
Liang Tang
d5856ba923
Remove authorization from specific routes ( #642 )
...
* fixes #569
* update listObjectsInS3ForUser
* update client-side routes
* update aws controller
* update
* redirect to /login when unlogged in
2018-05-29 21:37:10 -07:00
Liang Tang
29dde4776c
fixes #588 ( #629 )
2018-05-11 17:08:15 -07:00
Liang Tang
7a48899862
make keyboard nav accessible ( #628 )
2018-05-11 17:07:29 -07:00
Cassie Tarakajian
593621af62
fixex #627
2018-05-09 10:34:36 -07:00
Cassie Tarakajian
9285d2bf95
fix lint warning
2018-05-08 19:16:05 -07:00
Cassie Tarakajian
9efd9c624f
fix remaining linting errors
2018-05-08 19:16:05 -07:00
Cassie Tarakajian
617cffc869
fix many linting errors
2018-05-08 19:16:04 -07:00
Cassie Tarakajian
90c76c1d08
fix linting errors
2018-05-08 19:16:04 -07:00
Cassie Tarakajian
bd303b7710
fix even more linting errors
2018-05-08 19:16:04 -07:00
Cassie Tarakajian
5057a901fe
fix a few linting errors
2018-05-08 19:16:04 -07:00