Commit graph

405 commits

Author SHA1 Message Date
Shane Kilkelly
7ecadb14f6 Add a skeleton of a custom insertMatch function 2017-07-03 13:36:24 +01:00
Shane Kilkelly
bb3c5e7a34 Reverse direction, don't ignore commands in comments 2017-06-30 15:05:21 +01:00
Shane Kilkelly
bd88adb621 Account for mid-line comments 2017-06-30 14:03:34 +01:00
Shane Kilkelly
da286438be Don't trigger autocomplete when editing existing environment 2017-06-30 11:22:11 +01:00
Shane Kilkelly
c2fcbbeb72 Fix parsing, so it accurately captures command args 2017-06-30 10:55:10 +01:00
Shane Kilkelly
e2bff06aeb Add comment about ignoring comments 2017-06-30 08:42:03 +01:00
Shane Kilkelly
cfe51089f6 Ignore commands within comments when parsing document 2017-06-29 16:04:52 +01:00
Shane Kilkelly
db80f8ca1c Don't trigger autocomplete if we're on a comment line. 2017-06-29 14:42:08 +01:00
Shane Kilkelly
c9cda16a5e Refactor score calculation 2017-06-29 11:13:59 +01:00
Shane Kilkelly
936278b045 Bring score into line with new policy 2017-06-29 10:55:05 +01:00
Shane Kilkelly
cbae1857e7 Allow exact match to be ranked higher than any other result 2017-06-29 10:54:07 +01:00
Shane Kilkelly
3deebc8642 Change the scoring system for autocomplete, scale 0-100 2017-06-29 10:53:52 +01:00
Shane Kilkelly
1490b4a0da Remove Shift-Space autocomplete trigger, far to easy to misfire 2017-06-29 10:02:49 +01:00
Shane Kilkelly
69796bd835 also trigger autocomplete if last character is backslash 2017-06-28 15:48:21 +01:00
Shane Kilkelly
c9678ad699 Trigger autocomplete with Shift-Space, in addition to existing triggers 2017-06-28 15:24:37 +01:00
Shane Kilkelly
8b7a1bd4d9 Merge branch 'sk-labels-ac-debounce' 2017-06-20 13:53:23 +01:00
Shane Kilkelly
3d2d7652c6 Simplified and faster blanking 2017-06-20 08:46:47 +01:00
Shane Kilkelly
b4e2dcf7ef Match prefixes of ref and cite up to 16 characters 2017-06-20 08:46:28 +01:00
Shane Kilkelly
a299af12e8 Remove debug helper 2017-06-20 08:46:18 +01:00
Shane Kilkelly
85ddff15cb Move command-matching regex to the class level 2017-06-16 10:20:55 +01:00
Shane Kilkelly
0163ffc4bd Extend, and clean up the command-matching regex 2017-06-16 10:17:30 +01:00
Shane Kilkelly
1d905bd5ff Clean up string replacement 2017-06-16 09:49:16 +01:00
Shane Kilkelly
d9aff3c3f4 Blacklist more commands 2017-06-16 09:41:40 +01:00
Shane Kilkelly
a1d2d5b313 WIP: blank out label commands before running spell-check 2017-06-16 09:20:35 +01:00
Shane Kilkelly
403d822174 Alter labels debouncer to handle transitions between docs 2017-06-15 14:09:49 +01:00
Shane Kilkelly
b0bb4b3e47 Merge branch 'sk-ref-variants' 2017-06-15 09:17:48 +01:00
Shane Kilkelly
9607174b64 Merge branch 'master' into sk-server-side-labels-loading 2017-06-15 08:49:14 +01:00
Shane Kilkelly
3f1a440d66 Support variations of \ref{}, such as \cref{}, \eqref{}, etc.. 2017-06-14 15:15:07 +01:00
Shane Kilkelly
b0ff8e0745 Fix a typo: prefxi => prefix 2017-06-14 15:14:38 +01:00
Shane Kilkelly
5e37b1dac1 Move logic for selectively loading labels.
Only load labels if the user has write permission
2017-06-14 13:26:02 +01:00
Shane Kilkelly
3b066758bb Don't load labels for anonymous/read-only users 2017-06-13 14:06:00 +01:00
Shane Kilkelly
a04eb1197d Move labels service to /ide/labels/services/labels 2017-06-13 11:43:25 +01:00
Shane Kilkelly
debb0c06a4 Clearer logic for triggering labels-loading 2017-06-12 14:23:29 +01:00
Shane Kilkelly
234a2d0e21 Remove cruft 2017-06-12 11:37:34 +01:00
Shane Kilkelly
1bb065344c Move labels into an Angular Service 2017-06-12 09:44:32 +01:00
Shane Kilkelly
5443b92e7d Move state management into LabelsMaster on the ide 2017-06-09 11:28:27 +01:00
Shane Kilkelly
965a46291b Only fetch labels for uploaded docs, not files 2017-06-08 15:55:17 +01:00
Shane Kilkelly
ff7955dfdb Update labels when docs are uploaded or removed 2017-06-08 15:12:18 +01:00
Shane Kilkelly
c7dbd21cd1 use flag on aceEditor to enable autocomplete features 2017-06-08 09:22:08 +01:00
Paulo Reis
240d6d6f6b Resolve timing issue when triggering selection-related logic. 2017-06-07 14:21:05 +01:00
Paulo Reis
53b18e041f Trigger selection-related logic after accepting or rejecting changes. 2017-06-07 14:03:58 +01:00
Paulo Reis
19ecffd654 Merge branch 'master' into pr-aggregate-insert-delete 2017-06-06 17:04:31 +01:00
Paulo Reis
73a67c6617 Add a note on the need of reverse sorting changes when rejecting. 2017-06-06 13:34:48 +01:00
Paulo Reis
4504f77aa3 Do bulk rejects in reverse order. 2017-06-06 12:06:43 +01:00
Paulo Reis
5a75663a0c Do bulk rejects in reverse order. 2017-06-05 17:17:47 +01:00
Shane Kilkelly
f7ad4a4786 WIP: basically working, with client sync 2017-06-05 14:48:50 +01:00
Shane Kilkelly
51881dbbcc Only load labels from current doc if change is local 2017-06-05 11:09:58 +01:00
Paulo Reis
8d8bcab1e8 Consolidate change accept and reject code. 2017-06-05 10:41:59 +01:00
Shane Kilkelly
4cb41a988a WIP: initial work on server-side labels 2017-06-02 15:12:59 +01:00
Shane Kilkelly
51e3a6b3a3 Don't use String.startsWith, use slice instead.
- String.startsWith is not supported in IE
2017-06-02 09:54:48 +01:00
Shane Kilkelly
9a15420c4e Merge branch 'master' into sk-labels-autocomplete 2017-06-01 08:34:56 +01:00
Shane Kilkelly
039d18bf8b Simplify logic for deciding whether to re-scan doc on not 2017-05-26 15:08:38 +01:00
Shane Kilkelly
faf0337ca9 Refactor labels autocomplete 2017-05-26 14:56:38 +01:00
Shane Kilkelly
7923450e25 Move labelsManager into aceEditor directory 2017-05-25 09:42:07 +01:00
Shane Kilkelly
ea9a0dda83 More robust change detection for autocomplete.
- accurately detect when labels are involved in 'remove' event
2017-05-25 09:33:15 +01:00
Shane Kilkelly
b871cdab4c Remove debug logs 2017-05-24 14:28:15 +01:00
Shane Kilkelly
1f3a375b4e Update commentary 2017-05-24 11:42:00 +01:00
Shane Kilkelly
da84b3f31c WIP: basically working labels/ref autocomplete 2017-05-24 11:40:12 +01:00
Shane Kilkelly
c43a2087d7 WIP: autocomplete for label/ref 2017-05-24 10:07:14 +01:00
Paulo Reis
58ad62c413 Relayout entries when commenting. 2017-05-19 16:57:51 +01:00
Paulo Reis
957b201fc1 Add commenting and track-changes keyboard shortcuts. 2017-05-19 15:28:49 +01:00
Paulo Reis
832764dd3d Add key shortcut to toggle the review panel. 2017-05-18 11:02:50 +01:00
Paulo Reis
7f3c0ed5ac Refactor accept and reject methods to support multiple changes; support bulk actions events. 2017-05-16 14:27:06 +01:00
James Allen
b22ef30876 Merge pull request #456 from sharelatex/ja-show-too-many-track-changes-error
Show an explanation error message on too many track changes error
2017-03-21 13:15:14 +00:00
James Allen
3c2f5525a1 Show an explanation error message on too many track changes error 2017-03-17 14:49:32 +00:00
James Allen
aa36768d8a Remove debugging line 2017-03-16 16:01:03 +00:00
James Allen
6c1a15a698 Move comments when cutting and pasting 2017-03-16 15:48:57 +00:00
James Allen
a6679a1aeb Stop local and remote ops being batched together in the undo manager if they happen in the same flush 2017-03-01 16:33:04 +00:00
James Allen
dd0271e799 Only cancel deletes with inserts on undo and reject 2017-02-24 14:20:26 +01:00
James Allen
7418d12bf8 Defer updates of remote ops until Ace has been updated 2017-02-23 11:34:58 +01:00
James Allen
f4bbd8ea10 Use dirty state rather events to avoid O(N^2) behaviour 2017-02-23 11:27:19 +01:00
James Allen
6c21d19894 Increase offscreen lines considered for visibility 2017-02-20 16:24:19 +01:00
James Allen
8c5800ceaf Only render the entries that are visible in the text 2017-02-20 16:03:02 +01:00
James Allen
b52e4a5d1c Reset scroll margins when changing document 2017-02-20 15:46:53 +01:00
James Allen
995fa6122b Scroll the review panel past the limits of Ace 2017-02-20 12:56:26 +01:00
James Allen
b48f57c2cb Submit comment on blur or selection change 2017-02-14 13:41:04 +01:00
James Allen
e99c9a2065 Enable track changes for beta users 2017-02-13 12:09:47 +01:00
James Allen
51b76d2cf9 Merge pull request #413 from sharelatex/ja-abort-in-progress-spell-checks
Abort any inprogress spell checks when switching document
2017-02-08 11:38:05 +01:00
James Allen
87aea41bed Abort any inprogress spell checks when switching document 2017-02-08 11:32:19 +01:00
James Allen
d44a0ece97 Merge pull request #411 from sharelatex/ja-fix-cursor-on-resize
Ja fix cursor on resize
2017-02-08 11:30:37 +01:00
James Allen
123300cdfb Clear highlighted word manager on session change 2017-02-08 11:08:26 +01:00
James Allen
11a104ef96 Move spelling marker to back marker layer where it is updated properly by Ace 2017-02-07 15:55:00 +01:00
James Allen
c1a2779d9e Merge branch 'master' into ja-fix-cursor-on-resize 2017-02-07 15:27:01 +01:00
James Allen
d00619ff3d Keep the cursor in the same position on screen when the editor resizes 2017-02-07 15:23:44 +01:00
James Allen
27c48f3790 Clear selection after creating a comment 2017-02-03 14:17:09 +01:00
Shane Kilkelly
4e9426e6bf Merge branch 'master' into sk-pug 2017-01-30 14:36:10 +00:00
James Allen
30618d33db Add in extra check to set ui state 2017-01-27 17:13:11 +01:00
James Allen
d9b774bb9b Sycn track changes based on doc state, not editor state 2017-01-27 17:12:17 +01:00
James Allen
ff7c5a0954 Merge branch 'master' into ja-track-changes 2017-01-27 17:11:49 +01:00
James Allen
68aab6e05c Don't use code check on .bib files 2017-01-26 16:13:21 +01:00
James Allen
abb4ef14d8 Streamline the update/rendering process to not do extra work 2017-01-26 15:08:30 +01:00
Shane Kilkelly
57cd54bf55 WIP: migrate from jade to pug 2017-01-20 12:03:02 +00:00
James Allen
4a47d135c7 Reapply ops to track changes as current user when reconnecting 2017-01-17 14:54:22 +01:00
James Allen
1b63db91d0 Add in a null check 2017-01-17 11:51:02 +01:00
James Allen
bf7038f506 Adapt review panel line height to editor 2017-01-13 14:52:08 +01:00
James Allen
6c49b95538 Don't allow overlapping comments
Note that this is only a 'soft' don't allow. You could resolve a comment, comment in the same area,
and get them to overlap. It's not a problem if they overlap, just a bit ugly UI wise
2017-01-13 14:17:47 +01:00
James Allen
aab4dea8ae Merge branch 'master' into ja-track-changes 2017-01-13 13:46:01 +01:00
James Allen
2052ee63a3 Recover tracked changes after a disconnect 2017-01-12 17:19:19 +01:00
James Allen
f9b8ada215 track changes for anonymous users 2017-01-12 13:29:57 +01:00
James Allen
953371ad2d Don't double track a reject 2017-01-12 10:59:16 +01:00
James Allen
f31fa98679 Sync track changes state between sessions and client 2017-01-10 16:11:12 +01:00
James Allen
12e1b2bc3d Don't show resolved comments highlighted in the text 2017-01-10 11:55:59 +01:00
James Allen
9379cff89d Add end point for accepting change in doc updater 2017-01-09 15:25:27 +01:00
James Allen
ae30f32481 Use deterministic ids based on a seed 2017-01-09 10:49:03 +01:00
James Allen
5155ebaeec Don't show resolved comments when loading editor 2017-01-05 10:55:16 +01:00
James Allen
988005e929 Send and get comments via the chat api 2016-12-16 16:42:41 +00:00
James Allen
5717cafcec Create comments via comment ops 2016-12-13 17:57:46 +00:00
James Allen
898277b4af Refactor ops model so it all happens in Document 2016-12-13 17:34:29 +00:00
Brian Gough
6e8ee826dc update latex syntax checker to include mathmode
from our ace commit 21dde1e5f104b02e19534e56d7eb2dbd3a950db9

provide it as a beta release first
2016-12-12 10:10:49 +00:00
James Allen
1d426e538f Load ranges from docupdater and toggle track changes when possible 2016-12-08 14:10:30 +00:00
James Allen
04c151eed0 Only bind to Ace if track changes is enabled 2016-11-24 16:56:50 +00:00
Paulo Reis
8d933d9b5f Toggler style adjustments. 2016-11-23 16:10:35 +00:00
Paulo Reis
ba5118d02a Merge branch 'master' into ja-review-panel 2016-11-23 10:41:20 +00:00
James Allen
33f6c0dd1b Jump to position based on offset since we don't know doc lines for unopen docs 2016-11-22 16:34:39 +00:00
James Allen
db93bc8cff Grey out and add extra info to resolved comments 2016-11-21 17:13:17 +00:00
James Allen
222401c7fd Pull out logic linking changesTracker to reviewPanel.entries into ReviewPanelController 2016-11-21 16:57:52 +00:00
Brian Gough
889d8f51c4 make Document _onError handler more robust
replace console.error with sl_console.log to prevent browser crashing
before exiting document if console object does not exist.
2016-11-21 13:58:08 +00:00
James Allen
bf20799478 Allow comments to be resolved an deleted 2016-11-17 18:06:08 +00:00
James Allen
4a93e02407 Goto a change when clicked in the overview panel 2016-11-17 15:55:18 +00:00
James Allen
d1a3ff4b73 Refactor callout and background styles and don't show in overview 2016-11-17 15:33:34 +00:00
James Allen
77400b000b Focus on box when adding a comment 2016-11-17 15:20:25 +00:00
Paulo Reis
df420e0d21 Remove deprecated event handlers, conditionally add the new ones in the Ace wrapper directive. 2016-11-17 14:34:23 +00:00
James Allen
15d8f6c661 Sort out scroll bar positions and scroll position transitions 2016-11-17 14:29:35 +00:00
Paulo Reis
4bba8e8977 Remove deprecated event handlers, conditionally add the new ones in the Ace wrapper directive. 2016-11-17 10:51:17 +00:00
Paulo Reis
f170fd4b83 Refactor Ace directive to have a single events bridge. 2016-11-17 10:40:08 +00:00
James Allen
2f136c15c3 Don't draw our hacked zero width markers when they are offscreen 2016-11-16 16:22:59 +00:00
James Allen
56408728cd fix initialization error 2016-11-16 14:00:29 +00:00
James Allen
443d772866 Don't clear entries when switching files 2016-11-16 13:53:01 +00:00
James Allen
479ea83e36 Dump everything (unstyled) into the review panel 2016-11-16 13:51:30 +00:00
James Allen
3b4670509a Remove left over debug logging 2016-11-15 15:51:15 +00:00
James Allen
4542d1094d Keep separate persistent change tracker for each doc 2016-11-15 15:48:12 +00:00
James Allen
c89579e1df Focus on the focused change 2016-11-14 12:47:46 +00:00
James Allen
d32a7d0a94 Only apply doc changes, not fold changes in undo manager 2016-11-14 09:44:59 +00:00
James Allen
9509e87dc1 Update entries in place and position via DOM attributes directly 2016-11-11 16:09:32 +00:00
James Allen
938a8c4894 Fix logic around not tracking rejections to changes 2016-11-10 10:58:55 +00:00
James Allen
34b2b665a3 Accept and reject changes 2016-11-10 10:52:09 +00:00
Paulo Reis
19241e571f Distinguish between inserts and deletes in the entries repeater. 2016-11-09 15:58:03 +00:00
James Allen
6d7f4e9e6a Add basic comment replying 2016-11-09 15:25:41 +00:00
James Allen
707ed43a7d Very crude adding of comments 2016-11-09 14:50:58 +00:00
James Allen
446ca7212a Track timestamps of changes 2016-11-09 12:19:48 +00:00
James Allen
cd494f7866 Update ChangesTracker to handle delete edge case 2016-11-08 17:57:23 +00:00
James Allen
f68c615f61 Remove markers correctly 2016-11-08 17:47:54 +00:00
James Allen
084838926d Add in dashed line callouts for changes and comments 2016-11-08 17:31:08 +00:00
James Allen
064ae1945a Toggle review panel and track changes with ui elements 2016-11-08 16:43:01 +00:00
James Allen
a907ec04fc Don't complain about comment markers when checking 2016-11-08 15:17:20 +00:00
James Allen
8c65cb5835 Track and highlight comment ranges 2016-11-08 15:12:25 +00:00
Brian Gough
307f08e6bb Merge pull request #363 from sharelatex/bg-lock-editor-when-connection-down
lock editor when connection down
2016-11-04 11:04:30 +00:00
Brian Gough
476de0118c Merge pull request #362 from sharelatex/bg-fix-saving-indicator
fix saving indicator
2016-11-04 11:02:32 +00:00
Brian Gough
d2ba575d85 note that acks are for our own ops 2016-11-04 10:55:46 +00:00
Brian Gough
c25395d80b fix links to wiki 2016-11-04 10:25:08 +00:00