Repository navigation

Slider n arrows - #170

Open

aboss1 wants to merge 276 commits into

PencilCode:masterfrom

davidbau:slider_n_arrows

Open

Slider n arrows#170
aboss1 wants to merge 276 commits into
PencilCode:masterfrom
davidbau:slider_n_arrows

This pull request is big! We're only showing the most recent 250 commits

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

Commits

Commits on Jun 26, 2015

Commits on Jun 29, 2015

Commits on Jun 30, 2015

Commits on Jul 1, 2015

Commits on Jul 2, 2015

Commits on Jul 6, 2015

Commits on Jul 10, 2015

Commits on Jul 12, 2015

Commits on Jul 13, 2015

Commits on Jul 14, 2015

Commits on Jul 15, 2015

Commits on Jul 16, 2015

Commits on Jul 17, 2015

Commits on Jul 20, 2015

Commits on Jul 21, 2015

Commits on Jul 22, 2015

Commits on Jul 23, 2015

Commits on Jul 24, 2015

Commits on Jul 27, 2015

Commits on Jul 28, 2015

Commits on Jul 29, 2015