summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/single_file_diff.js
Commit message (Collapse)AuthorAgeFilesLines
* Clean up diff renderingDouwe Maan2017-05-231-1/+1
|
* remove bind polyfill from single_file_diff.jsMike Greiling2017-05-081-3/+1
|
* replace implicit this == window with explicit bindingMike Greiling2017-02-171-1/+1
|
* Use a new class to keep old behaviorFilipa Lacerda2017-02-081-2/+2
|
* resolve all x-spacing and no-spaced-x eslint violationsMike Greiling2017-01-181-2/+2
|
* resolve all padded-blocks eslint violationsMike Greiling2017-01-181-3/+1
|
* fixed commit diff linking and added specsfix/diff-titleLuke "Jared" Bennett2017-01-141-12/+10
|
* resolve all instances of no-undef eslint rule violationsclean-no-undefMike Greiling2016-12-141-3/+4
|
* re-apply MR !6285 "Added forceLoad ability to singleFileDiffs, added ↵Luke Bennett2016-12-021-8/+14
| | | | | | callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found" Use url utility to retrieve hash
* temporarily revert "Added forceLoad ability to singleFileDiffs, added ↵Mike Greiling2016-12-021-12/+7
| | | | | | callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found" This reverts commit d2ee380816fa161d94da54c1f7e594c9a2ba2241.
* explicitly disable eslint inlineexplicitly-disable-eslint-inlineLuke "Jared" Bennett2016-11-151-1/+1
|
* Changed how resolving notes is renderedPhil Hughes2016-11-101-6/+6
| | | | Vue2 was taking the template out & then appending again. This changes that
* Merge branch '21633-permalink-to-collapsed-diff-line-does-not-work' into ↵Fatih Acet2016-11-011-7/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fixed anchoring diff lines in collapsed diffs ## What does this MR do? This MR adds the ability to `forceLoad` a collapsed diff from instantiation, on top of this, if it is force loaded, we can pass a callback function to be invoked when the content is loaded. Now when a MR is loaded, we check for a diff line anchor that is currently within a collapsed diff, we re-instantiate the `singleFileDiff` with the `forceLoad` option. We also pass a callback function that in responsible for highlighting and scrolling to the specified anchor. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? We currently cannot anchor link to collapsed diff lines as the do not auto-expand. ## Screenshots (if relevant) https://youtu.be/fZVLlP6kchw ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21633 See merge request !6285
| * Added forceLoad ability to singleFileDiffs, added callback to ↵21633-permalink-to-collapsed-diff-line-does-not-workLuke Bennett2016-10-211-7/+12
| | | | | | | | | | | | getContentHTML, added conditional force load if a collapsed diff line anchor is found Use url utility to retrieve hash
* | disable ESLint for all JavaScript fileswinniehell2016-10-261-0/+1
|/
* Updated diff toggle targets and added iconLuke Bennett2016-09-031-3/+10
|
* Fixed issue with expand diff not initializing resolve buttonsPhil Hughes2016-08-041-4/+5
|
* Checks if DiffNotesApp is definedPhil Hughes2016-08-011-3/+3
|
* Moved method to compile components from window into diffnotesappPhil Hughes2016-08-011-3/+9
|
* Updated issues with jump tp buttonPhil Hughes2016-08-011-2/+5
| | | | Fixed styling bugs
* ES6ify all the things!Fatih Acet2016-07-241-0/+77
View Lorry Controller Status