Commit graph

342 commits

Author SHA1 Message Date
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
Brian Gough
e1b54322ee fix whitespace 2016-11-04 10:18:33 +00:00
Brian Gough
49a06f8489 modal for lost connection 2016-11-03 12:37:44 +00:00
Brian Gough
91a590ad0e update links from tender to wiki 2016-11-03 12:28:19 +00:00
Brian Gough
62b8c30d0b make pollSavedStatus more robust against failure
check last ack timestamp and size of pending op

provide method to compute sharejs op size so we can check if pending
ops get too big
2016-11-03 11:28:23 +00:00
James Allen
8763e444e9 Include aceDelta in error message 2016-11-03 11:23:27 +00:00
James Allen
091eb7e462 Merge branch 'master' into ja-review-panel
Conflicts:
	public/coffee/ide.coffee
	public/stylesheets/app/editor.less
2016-11-03 10:07:37 +00:00
James Allen
11c24377cb fix JSONstringifyWithCycles 2016-10-31 16:57:29 +00:00
James Allen
c2eb49845f Revert "Make very simple shallow copy of aceDelta when there's an undo error"
This reverts commit 1d77a95f17dde6f8792bca1989d65952474b144c.
2016-10-31 16:56:49 +00:00
James Allen
26410690da Make very simple shallow copy of aceDelta when there's an undo error 2016-10-31 16:47:13 +00:00
James Allen
8368577867 Merge branch 'master' into ja-review-panel
Conflicts:
	app/views/project/editor/editor.jade
	public/coffee/ide.coffee
	public/coffee/ide/editor/directives/aceEditor.coffee
2016-10-31 16:42:55 +00:00
Brian Gough
8887ab78c0 improve ace mode recognition 2016-10-27 15:42:19 +01:00
Brian Gough
cb4380fa78 fix problem with setting syntax validation option 2016-10-26 15:08:29 +01:00
James Allen
c9925a3590 Handle reporting of cyclic objects to Sentry 2016-10-26 11:34:05 +01:00
James Allen
2ac405e58c Allow track changes to be toggled on and off 2016-10-20 16:59:58 +01:00
Brian Gough
e9b5fc056d fold aceEditor resetSession into session set up
it is not used elsewhere, and mode setting is now done during the
initialisation.
2016-10-20 16:03:55 +01:00
Brian Gough
7258e947a8 use ace modelist extension to auto-detect mode 2016-10-20 16:03:19 +01:00
James Allen
60a81beb11 Try out different styling for highlights 2016-10-20 15:18:45 +01:00
James Allen
2b94c69795 Don't use the trackChanges engine in the history editor panel 2016-10-20 12:19:57 +01:00
James Allen
52f3fe7303 Show different users changes in different colours 2016-10-20 12:15:22 +01:00
Brian Gough
3a07b785db disable auto insert of brackets and quotes in ace 2016-10-20 11:33:12 +01:00
James Allen
193766b437 Don't switch back to editor view when selecting a file in the history view 2016-10-19 10:43:53 +01:00
James Allen
c88624bf4c Pass through the data needed to trackChangesManager to determine if a remote was local or remote 2016-10-18 18:01:52 +01:00
James Allen
e717caab7f Merge branch 'master' into ja-review-panel 2016-10-18 16:52:41 +01:00
James Allen
05cd6e69a7 Add in extra sentry logging for undefined start in aceDelta 2016-10-18 16:37:40 +01:00
James Allen
42ab2e8165 Init review panel with ace editor height 2016-10-13 12:21:49 +01:00
James Allen
77c02042f8 Recalculate change offsets on editor resize 2016-10-13 12:09:18 +01:00
James Allen
fc782581ea Change review panel to feel like part of ace 2016-10-12 17:27:20 +01:00
James Allen
c689937297 Merge pull request #338 from sharelatex/ja-track-changes
Ja track changes
2016-10-12 09:21:46 +01:00
James Allen
4ac55c7671 Merge branch 'ja-track-changes' into ja-review-panel 2016-10-11 14:24:51 +01:00
Brian Gough
452f6117cd remove console.log 2016-10-11 13:56:17 +01:00
James Allen
32d7bb16e5 Be more explicit with query string to turn on track changes 2016-10-11 09:40:15 +01:00
James Allen
9682af3981 Merge branch 'master' into ja-track-changes
Conflicts:
	public/coffee/ide/history/HistoryManager.coffee
2016-10-10 17:10:10 +01:00
James Allen
0995ba5ee6 Add basic change tracking into editor behind a feature flag 2016-10-10 17:06:46 +01:00
James Allen
220759ee7a Merge pull request #330 from sharelatex/ja-non-english-spell-check
Use comprehensive unicode letter regex for spell check matching
2016-10-10 08:54:56 +01:00
Brian Gough
9177544ed9 add left menu for syntax validator 2016-10-06 11:51:24 +01:00
James Allen
201012a131 Use comprehensive unicode letter regex for spell check matching 2016-10-04 11:24:48 +01:00
Brian Gough
0eaa359f6c use syntax validator for beta programme users only 2016-09-23 15:19:40 +01:00
Brian Gough
d152095920 destroy ace sessions when no longer in use
also set mode to "latex" when session is created, to avoid setting mode
to "text" (default) and then to "latex" which causes the text worker to
be unnecessarily created and destroyed.
2016-09-23 15:19:40 +01:00
Brian Gough
0a350c8e3f infrastructure for using ace syntax checking 2016-09-23 15:19:40 +01:00
Brian Gough
cb4f6391a2 updated comments 2016-08-16 10:59:27 +01:00
Brian Gough
7863b7cab6 when calling gotoLine also scrollToLine to put line in view 2016-08-11 16:46:30 +01:00
Brian Gough
daa1d80865 add extra delay to gotoLine event 2016-08-11 16:46:12 +01:00
Brian Gough
a3c8202d0e support jumping to position with line and column from log entries 2016-07-29 14:59:48 +01:00
Shane Kilkelly
72c9c3f020 If there are no completions matching, detach the completer.
This prevents an invisible completer from swallowing keystrokes such as up/down
2016-07-26 15:54:33 +01:00
Paulo Reis
d6c966934d Set the key binding which is reported on Windows. 2016-06-21 16:53:50 +01:00
James Allen
345d38c28d Don't clean up a documents event listener until after the socket has disconnected on error 2016-05-27 14:39:33 +01:00
James Allen
36c8c197e1 Add more debug log lines 2016-05-27 14:14:08 +01:00
James Allen
fec3266726 Don't remove new instance of Document from openDocs when cleaning up old instance 2016-05-27 14:13:53 +01:00
James Allen
a605dae7ba Don't show saving just because of pending ops
When typing continuously, there is always a pending op present.
The only time we're not saving is if the inflight op isn't changing.
So long as this has changed, it means the previous one has been processed.
2016-05-27 14:08:46 +01:00
James Allen
4bc31ae2b9 Don't throw an error if we get an ack for our update more than once, since we may try sending it more than once 2016-05-27 10:46:14 +01:00
James Allen
6ea58d4d6c Don't try to resend an update if the editor is not joined to the project 2016-05-27 10:46:14 +01:00
James Allen
39e57a9886 Throw fatal error if document update actually returns an error from the real-time service 2016-05-27 10:46:14 +01:00
James Allen
0175a86d4c Add in debugging console.logs which only display if ?debug=true is in URL 2016-05-27 10:46:14 +01:00
Shane Kilkelly
ae85dc3f5d Enable spaces after commas in references autocomplete 2016-05-12 15:13:00 +01:00
Shane Kilkelly
9eb2e933cd enable autocomplete on citations like citeauthor 2016-05-12 12:03:08 +01:00
Shane Kilkelly
76697599ae Use the _ide version of browserIsSafari 2016-04-11 14:45:26 +01:00
Shane Kilkelly
8d6003dcc5 Add commentary 2016-04-11 09:58:37 +01:00
Shane Kilkelly
4fd4a0372c In Safari, limit iterations of the command-parsing loop. 2016-04-11 09:55:53 +01:00
Shane Kilkelly
059d3432c2 Allow citations like -parencite[page 6]{ to work. 2016-03-30 11:28:56 +01:00
Shane Kilkelly
11d77df898 Fix weird tab behaviour 2016-03-17 16:18:46 +00:00
Shane Kilkelly
020fd2e88d De-dupe autocomplete entries 2016-03-17 15:58:57 +00:00
Shane Kilkelly
53b46e42cd Refactor, take indentation into account. 2016-03-17 15:27:20 +00:00
Shane Kilkelly
229ced6f2f Remove Indentation. 2016-03-17 14:43:34 +00:00