Luiza Pagliari
1ebcf0dc47
Merge pull request #2891 from bhldev/padShortcutDisable
...
Added pad shortcut disabling feature to settings.json
2017-05-11 11:29:25 -03:00
Luiza Pagliari
b2d9f57338
[fix] Consider line attribs of plugins when building changesets
...
When checking the places on text that are identical between content
before and after a changeset, we were considering only the standard
(Etherpad-core) attributes, and not taking into account attributes
created by the plugins. One consequence was that the '*' marker of lines
with line attribs were being kept, even when the new lines have
different line attribs. See #3118 for more details.
Fix #3118 .
2017-01-12 12:42:56 -02:00
Dan Bornstein
a3765d9785
Account for any top margin on the first line.
...
Without this change, a top margin on any element on the first line of pad
content would throw off the alignment of line numbers. The default stylesheet
doesn't define any elements with top margins, but plugins might. (This is also
explained in a code comment.)
In order to see the problem, add the following clause to `iframe_editor.css`
(before incorporating this commit):
#innerdocbody > :first-child {
margin-top: 100px;
}
2016-08-30 11:19:28 -07:00
Luiza Pagliari
ea562250d9
Perform drag and drop in one changeset, so UNDO works properly. Fix #3041
2016-08-22 18:44:17 -03:00
John McLear
f09e10b122
Merge pull request #2944 from storytouch/aceRegisterNonScrollableEditEvents
...
Create hook to register events that won't scroll editor after aceEditEvt
2016-06-20 10:36:53 +01:00
Luiza Pagliari
3fb695a7a0
Create hook to register events that won't scroll editor after aceEditEvt
2016-03-30 11:51:18 -03:00
John McLear
97b971747f
forgot this one
2016-03-26 22:01:26 +08:00
Brian Lim
26aeb7b705
Added pad shortcut disabling feature
2016-01-21 07:38:41 -05:00
Brian Lim
ae033a1e86
Fix for 2844 and 2812
2016-01-18 23:57:40 -05:00
John McLear
f9937343c7
fix drop event on last char
2016-01-17 15:11:54 +00:00
John McLear
935b921c2b
more tidy
2016-01-10 14:40:57 +00:00
John McLear
ae6110919f
removal
2016-01-08 13:39:59 +00:00
John McLear
793b34d17b
hrm, removal
2016-01-08 13:39:32 +00:00
John McLear
34a46d6318
should be clean enough to push
2015-12-23 14:35:52 +00:00
John McLear
bf6e225aa2
include event on paste and drrororororop
2015-12-05 19:06:40 +00:00
John McLear
b3d44b6956
remove con log
2015-12-05 18:51:27 +00:00
John McLear
fa492dc926
ace drop event
2015-12-05 18:50:51 +00:00
joassouza
4c8c1f53b5
Update the bowser.js to the new version
...
With this new version of bowser.js is possible detect the OS as well,
no only the browser as the previous one. It brings support to
new browsers as well.
2015-12-01 11:53:49 -03:00
John McLear
f774c2584f
paste hook and class for editorcontainer
2015-11-06 13:21:25 +00:00
John McLear
c575c8b447
Merge pull request #2820 from storytouch/fix_2818
...
Fix logic to check if any hook handled ACE key event. Fix #2818
2015-11-02 13:08:30 +00:00
John McLear
2b980653d6
Merge pull request #2822 from storytouch/esc
...
Allow plugins handle "esc" key event
2015-11-02 13:08:01 +00:00
Luiza Pagliari
478f5788e3
Add callstack to aceSelectionChanged context
2015-10-30 12:13:43 -02:00
joassouza
959de82e2a
Allow plugins handle "esc" key event
2015-10-29 14:54:21 -03:00
Luiza Pagliari
c551fe4c1e
Fix logic to check if any hook handled ACE key event. Fix #2818
...
Instead of checking if only the first hook had returned true, we check
all hooks.
2015-10-27 07:44:51 -02:00
John McLear
c337a0585c
Merge pull request #2724 from xavidotron/develop
...
Add a aceSelectionChanged hook to allow plugins to react when the cursor moves
2015-10-22 16:19:07 +01:00
John McLear
50171a4c3c
Merge pull request #2805 from storytouch/indentationSetting
...
Create setting to control if a new line will be indented or not
2015-10-22 16:12:07 +01:00
John McLear
82c7ca4ac3
add classes for bootstrap targeting, pew pew
2015-10-22 01:32:02 +01:00
Luiza Pagliari
5deb06d589
Create setting to control if a new line will be indented or not
...
Currently pressing ENTER on a line that ends with ':', '[', '(' or '{'
automaticaly indents the new line with 4 spaces. The variable added by
this commit to settings.json allow an Etherpad instance to not have this
behavior.
2015-10-13 18:39:23 -03:00
Luiza Pagliari
330d2b079d
Fix 2772. Skipping line marker when applying attribs to a range
2015-09-08 11:55:36 -03:00
Xavid
008d4e653c
Add a aceSelectionChanged hook to allow plugins to react when the cursor
...
location changes.
2015-07-11 11:33:20 -04:00
Xavid
778e1e4641
Allow a return keypress in a list on the last line of a pad to create a new
...
line.
2015-06-19 14:03:22 -04:00
John McLear
f5ccd3ce6d
Merge pull request #2656 from stefanmintert/20150507-innertext-bugfix
...
Bugfix innerText
2015-05-07 23:09:24 +01:00
John McLear
debca84ebe
Merge branch 'develop' of https://github.com/ether/etherpad-lite into fix-dead-keys
2015-05-07 15:56:01 +00:00
John McLear
975bd99064
support for french stuff
2015-05-07 15:55:52 +00:00
Stefan Mintert
250afd0451
Bugfix. Description of bug at https://github.com/tm-linkwerk/ep_linebreak/blob/WR-72-linebreak-cursorverhalten/static/hooks.js#L94
2015-05-07 16:47:14 +02:00
John McLear
c903cb3925
fix alt c and escape
2015-05-06 00:32:36 +01:00
John McLear
0a9c631410
better fix for #2625
2015-05-01 20:44:36 +01:00
John McLear
dbb2956d2f
allow chrome to use control shift 1 to send ordered list
2015-04-28 15:48:12 +01:00
John McLear
b349a4f226
probably fixes #2625
2015-04-23 17:49:08 +01:00
John McLear
b8192fd015
first attempt at fixing dead keys, it cant be this easy can it?
2015-04-17 17:01:15 +01:00
John McLear
6a027d88a9
fix older IEs
2015-04-12 13:00:01 +01:00
John McLear
14fab9f441
FF middle click fix
2015-04-11 10:45:51 +01:00
John McLear
7e99724fec
Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility
2015-04-06 13:19:42 +01:00
John McLear
e49bb4017c
use ctrl shift 2 instead of alt a
2015-04-05 13:42:26 +01:00
John McLear
85fc012bac
change to alt shit and a to show authors
2015-04-02 15:13:16 +01:00
John McLear
644536b27b
fix for #2574
2015-04-02 13:16:49 +01:00
John McLear
0b90da19d2
Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility
2015-03-31 23:32:15 +01:00
John McLear
70fdc7dcd7
Merge pull request #2423 from ether/fix/reimplement-ace-getAttributeOnSelection
...
Re-implement ace_getAttributeOnSelection
2015-03-31 23:21:49 +01:00
John McLear
e9d8c3b53a
expose method for getting a full user list on the client including historical data
2015-03-31 20:26:55 +01:00
John McLear
498e7f4961
MVP of alt A behavior to show author of line
2015-03-31 16:12:05 +01:00
