-
Notifications
You must be signed in to change notification settings - Fork 104
Slider n arrows #170
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
aboss1
wants to merge
276
commits into
PencilCode:master
Choose a base branch
from
davidbau:slider_n_arrows
base: master
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
Slider n arrows #170
Changes from all commits
Commits
Show all changes
276 commits
Select commit
Hold shift + click to select a range
7a585d3
Changed scrubber/slider ui
aboss1 2cdd7d0
Adjusting positioning of the slider/cleaning up css
aboss1 e4f1463
Fixed tests and wrapshmi
aboss1 24b1220
Added more styling
aboss1 3ce7317
Fixed positioning of arrow calls. Showing boxes for now and will add …
calistenson 9834cec
Arrows and positioning now working with the ACE editor.
calistenson 59a4dd6
Able to return canvas information for specific tracevent via slider
aboss1 866a7b6
Bug fixing on arrows code
calistenson 596f71f
attempting merge
calistenson cf0ef6e
Screenshots kind of work
aboss1 265b5ea
Screenshots work
aboss1 b9a3ac5
Fixed replay bug so programs can be stopped and restarted without a p…
calistenson 2d14501
Working on bugs with screenshots
aboss1 31825d8
Figured out error for screenshots
aboss1 2c1e895
Updated arrow code to use a passed in pane to view instead of always …
calistenson 7bcedfe
Added more tests
aboss1 6147553
merged slider and arrow debug features. Working on bug fixes now.
calistenson bb2f9f7
Added test for javascript
aboss1 ed8bbfe
Added bug fixes from previous file
aboss1 05ded33
bug fixing
calistenson e634118
merging/bug fixing
calistenson 4c8c420
Working on javascript test
aboss1 4515fe5
Fixed bug where slider disappeared when arrows showed. Changed arrows…
calistenson 26d5226
Fixed some style issues with arrows.
calistenson 4424e70
updated the view to improve positioning for arrows
calistenson 554c750
Fixed SVG canvas so that arrows do not obstruct click events on the a…
calistenson 4b5205f
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 5109c89
Added test
aboss1 4b8ce07
Fixed merge conflicts
calistenson 1d27772
Trying to merge
calistenson 3adb91f
Working on snapshotting turtle
aboss1 e1de2b8
Working on snapshotting turtle
aboss1 10061c2
Working on adding turtle screenshots
aboss1 9d82192
Working to create multiple arrows support
calistenson 66cde14
trying to merge
calistenson af2bd2e
merging
calistenson a563ece
Finished merging
aboss1 bb9f2a1
Fixed test
aboss1 128e54b
Instrument javascript programs
paigeruten 1baf8b3
Slider only appears when program is done tracing
aboss1 6f7128b
working on arrows positioning. Updated some variable names in debug.js
calistenson cd1d21c
fixed a conflict
calistenson f08be3b
merge with master
calistenson 10fb2ff
Working on connecting slider to deploy arrows
calistenson 5003579
editing stuff
aboss1 4a954a3
Fixed arrow positioning, fixed some variable bugs in debug.js, and ad…
calistenson 527a8a3
Bug fix on currentLocation variable in debug.js
calistenson 139e9bf
arrows working with droplet and ace editors
calistenson 71c4d0f
Working on slider
aboss1 4bdc8e2
Merged arrows and slider
aboss1 3d884fb
Added Martin's Suggestions to the slider
aboss1 4bb9265
Updated arrows and fixed view on events. Going to put view on events …
calistenson c6e0e3b
Working on slider
aboss1 88be0fc
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 c3f0c17
Updated branch
aboss1 8ef17a0
Merged with master
aboss1 e4366e7
Cleaned up code
aboss1 62ef926
Working on connecting arrows to slider
calistenson 8773599
Fixed pageoffset error
d1fcdc9
Updated arrows to be based on traceEvents
calistenson 4ed267a
Merging debugger
calistenson 0db3d03
Fixed cannot read 'first' of null error with arrows.
calistenson d84758c
Added screenshots
aboss1 5e06fba
Fixed arrow view error for null first
calistenson 8171483
Added logging
aboss1 7486e90
Merged with master
calistenson a6b0cd4
Fixed another merge conflict
calistenson e636929
Added slider resizing
aboss1 e84e217
Fixed resizing and any errors
aboss1 0568067
Replaced eventQueue with an event indexer to keep track of traceEvent…
calistenson 7f4f404
merging latest slider with latest arrows
calistenson 2434475
remove play button for cases
aboss1 e533ca3
Fixed droplet mode that I broke fixing arrows
calistenson d6fb9a2
Merging
calistenson 85890e8
Fixed function error
aboss1 4d66632
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 08fe89c
Merging with master
calistenson cf4d6cd
Merging
calistenson 2673373
Fixed merge issue with html2canvas
calistenson e00b447
Cleaned up console logs
aboss1 896330f
Added labels to slider
aboss1 a2073ab
Removed jquery pips error and added line no to float
aboss1 7405725
Readded file
aboss1 7d676fa
Fixed line numbers
aboss1 6e2faa7
Merge branch 'slider_n_arrows' into experiment
aboss1 b2d3a70
Fixing panel resizing
aboss1 4c21296
Finalizing css
aboss1 12e0edb
Finalizing css
aboss1 d63b428
Removed extra logging
aboss1 1c81578
Created buttons
aboss1 416a9c0
Merge with master
calistenson 77b00c8
Made some minor improvements
aboss1 18127a0
Merged
aboss1 698ad8e
cleaned up files
aboss1 4e8b8d2
Fixed delay and processingjs compatibility
aboss1 bf292ba
updated line highlighting to work based on debugIDs and animation eve…
calistenson 1288644
merge
calistenson fc9429a
Fixed protractor
calistenson 9110587
Made styling changes and added number of steps
aboss1 b2f62dd
Added before and after arrow functionality to slider. Now arrows fade…
calistenson 82539ae
merge
calistenson 881e2ca
Configuring arrows to work with line hover highlighting.
calistenson df62e7e
Fixed program edit
aboss1 fd246ce
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 77b2715
Fixed text spacing issue
aboss1 3dd95a4
Connected arrows to line hovering
calistenson b7c5b68
merge
calistenson 20a3469
Fixed function error
aboss1 c029223
attempting fix for functions in droplet
calistenson 28e621b
Adding new library
aboss1 e9f9be7
current arrows. testing with functions.
calistenson 7733077
merging
calistenson 7363843
Update pencil-tracer.js, ignore 'after' and 'leave' events
paigeruten 7bff254
Basic variable tracking
paigeruten 0af3692
Make variable tracking work with animations
paigeruten 7e51233
Fix 'after' event variable tracking
paigeruten 962b704
Make variable tracking work with slider
paigeruten 224d75d
Show variables from multiple events that are on the same line
paigeruten 7af1ebe
Clean up variable tracking merge
paigeruten 5ab467e
Made bower changes
aboss1 7bd2a3c
more bower
aboss1 bd15ff3
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 b72233d
Changed spacing in view
aboss1 51f5ba2
Make variable annotations smaller
paigeruten cd94f1e
Made protractor changes
aboss1 497ebc8
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 e5b34bc
Finished protractor
aboss1 04b5d7b
Updated arrow thickness and edge. Added previous line highlighting.
calistenson 8ee8df8
merged with pull
calistenson 02a8b7c
merge
calistenson e9aeb36
fixed merge conflicts
calistenson 8e1bb97
Added arrows and tooltipster
aboss1 48fb017
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 555a519
Trying to get css transitions to work
calistenson ea6605d
Fixed multiple editors error
aboss1 57e9dbd
Changed line highlighting to work with previous line highlighting
calistenson 0116d55
merging with rest of branch
calistenson 1383de5
fixed bug with end_program()
calistenson 90e1dcf
Working on view
aboss1 9f09903
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 e46dfb7
fixed merge error
aboss1 6933ef6
fixed tracing bug with parallel animation
calistenson 344de08
Added debug on/off button
aboss1 5e7542f
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 2ace5f0
Minor style adjustments to slider handle and debug toggle
aboss1 8ef61fc
Fixed another style overwrite
aboss1 cd32e39
Changed protractor on slider so it reflects debugRecordbyDebugid
aboss1 59762a7
Moved arrow functions out of view into a separate file
calistenson 4f4e09b
Making some small edits
aboss1 bf3fc56
Fixed tests so they accomodate new debug toggle
aboss1 07f1881
restructured arrow support
calistenson e543739
merge with pull
calistenson b8d08cd
Added seperate timeout function
aboss1 13bf8fa
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 bafb200
Working on scrolling support
calistenson 9e417ae
Merged with pull
calistenson 14dd3a7
Show anonymous function calls as "<anonymous>()=..."
paigeruten 29cc2fb
Filter out function definitions from tracked variables
paigeruten 363f95a
Filter out colors and other special variables for variable tracking
paigeruten 8332f74
Fix bug with showing the variables for the last line of the program
paigeruten c5e84f7
working on scrolling
calistenson 6489cf8
moved stuckComplexity.calls to reportEnter function in debug.js
calistenson 470356c
Working on consolidating code
aboss1 295646a
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 e0048e4
Changed the way the slider works
aboss1 12f204a
minor change
aboss1 f9dd236
fixed bug with entergutter
calistenson e4493ba
merge will pull
calistenson dbb1507
Show function arguments in tracked function calls
paigeruten b5aa223
Dot dot dot the function arguments if they're too long
paigeruten 78f2168
Merged with Master
calistenson 55124d7
Restructured debugRecordsByLineno object to rely on debugRecordsByDeb…
calistenson 3cf19d0
Making a test
aboss1 d69a916
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 2bc0789
Added a new test and edited gruntfile
aboss1 0b2aee6
Fixing some arrow styling
calistenson e7a4e2e
Edited package json file
aboss1 c1711c7
added test
aboss1 922618e
Fixed 'else' spacing
calistenson 36bbd4a
renamed file
aboss1 75d8fe9
Merge
calistenson f47a073
Edited test
aboss1 3a94703
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 3e3a248
Fixed test
aboss1 6de9978
Variable annotations scrolling
paigeruten e8213dd
Merge branch 'slider_n_arrows' of github.com:davidbau/pencilcode into…
paigeruten e8564a2
Wrapped up slider tests
aboss1 681806e
Fixed merge and finished test for coffeescript
aboss1 45a9bc9
Fixed another mege
aboss1 4c81d81
Added tests for arrows, updated arrow scrolling
calistenson 8d74bb1
Merge
calistenson d8d0e56
Added testing for javascript code
aboss1 17e6977
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 f080a02
Fixed wait code test
aboss1 2017fc0
Ignore all global variables setup by jquery-turtle, the debugger, etc.
paigeruten 6934d08
Update pencil-tracer.js
paigeruten 3e3883b
More testing
aboss1 ad29550
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 00d4873
Finished testing
aboss1 58073d5
responded to pr comment about resetDebugState
aboss1 e1d2428
Fixed minor styling issue with zindex
aboss1 a536e8a
Added comments to arrows, renamed some functions, and updated scrolli…
calistenson d7fd986
merge
calistenson 30c96d6
Removed unnecessary images file
aboss1 7fc79fd
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 5e7cdd9
Fixed bug with line hover arrow showing
calistenson 4a49e88
Merge
calistenson cd8b080
removed extra whitespace and fixed spacing
aboss1 f2ec8c4
Use source mapping for javascript, so errors are highlighted properly
paigeruten e8755ae
Fixed broken tests
aboss1 ea5c0b6
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 a15b894
Fixed whitespacing issues
aboss1 5267bc2
Fixing arrow positioning for scrolling
calistenson eead8ec
merge
calistenson 23306d3
Merged with latest code
aboss1 2df5ef8
Attempting to fix scrubbermark css issues
aboss1 ef52b21
Merge branch 'slider_n_arrows' into experiment
aboss1 7bbaa26
Updated tests for highlighting
calistenson fb17fc3
merge
calistenson 009d306
Hooked up all debug features to debug mode toggle on/off
calistenson 30c6aa2
Fixed addition/deletion of pane
aboss1 5ef98ea
Merge branch 'experiment' into slider_n_arrows
aboss1 dabf7ea
Merging with master
calistenson d3da666
Fixed debug toggle error
aboss1 f0adb3d
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 3fa8064
Track individual histories of variables and only show one at a time
paigeruten 46029a7
Merge branch 'slider_n_arrows' of github.com:davidbau/pencilcode into…
paigeruten 9f7091d
Working with arrow scrolling
calistenson 3bd2ac7
working on fixing library arrows
aboss1 d2f7425
working on fixing library arrows
aboss1 c7f9482
merge
calistenson 054c86a
Fixed string error in arrow svg
calistenson a6c6cb6
Fixed debug
aboss1 c176d45
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 5740cca
Fixed test
aboss1 54ac6e1
Removed extraneous files
aboss1 7c9f5ec
Responded to Bob's comments
aboss1 653f2fc
Created update_arrows function, simplified how block_mode var was cre…
calistenson 5672a05
merge
calistenson 73ca697
Updated arrows to have a redraw function. Did not fix the shaking in …
calistenson b2b21cb
Cleared logging statements, added comments, fixed some indendation
calistenson d81b636
Fixed some trailing whitespace
calistenson b438813
Fixed a bug with arrows in text mode
calistenson 0f746c3
Removed trailing whitespace and fixed spacing
aboss1 20e3aeb
Merge branch 'slider_n_arrows' of https://github.com/davidbau/pencilc…
aboss1 d1c11fe
Merge with master
calistenson 4ee140b
Merge with pull
calistenson 03b9236
Update pencil-tracer.js
paigeruten c951e41
Add some comments to explain variable/function tracking
paigeruten bff2831
Fix variable tracking for JavaScript programs that use global variables.
paigeruten 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,8 @@ | |
| </style> | ||
| <link rel="stylesheet" type="text/css" href="//<!--#echo var="site"-->/editor.css"> | ||
| <link rel="stylesheet" type="text/css" href="//<!--#echo var="site"-->/lib/droplet.css"> | ||
| <link rel="stylesheet" href="https://code.jquery.com/ui/1.10.4/themes/flick/jquery-ui.css"> | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is there a reason this goes to another site, and the rest seem to be copied here? |
||
| <link rel="stylesheet" type="text/css" href="//<!--#echo var="site"-->/lib/jquery-ui-slider-pips.css"> | ||
| <link rel="stylesheet" type="text/css" href="//<!--#echo var="site"-->/lib/font-awesome.css"> | ||
| <link rel="stylesheet" type="text/css" href="//<!--#echo var="site"-->/lib/tooltipster/css/tooltipster.css"> | ||
| </head> | ||
|
|
@@ -77,7 +79,7 @@ | |
| </div> | ||
| <div id="charlie" class="pane"></div> | ||
| </div> | ||
| <div id="guidepane"><div class="guidetitle">guide</div><div class="guidepreview"><iframe></iframe></div></div> | ||
| <div id="guidepane"><div class="guidetitle">guide</div><div class="guidepreview"><iframe id = 'my-iframe'></iframe></div></div> | ||
| </div><!-- end clip --> | ||
| <script src="/load<!--#echo var="filepath"-->?callback=preload"></script> | ||
| <script src="/lib/ace/ace.js"></script> | ||
|
|
||
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.
All the images that you have also copied should be included here, if they are needed. (If they are not needed, then we don't need to check in those files.)