diff options
| author | Peter 'Pita' Martischka <petermartischka@googlemail.com> | 2012-11-13 07:43:48 -0800 |
|---|---|---|
| committer | Peter 'Pita' Martischka <petermartischka@googlemail.com> | 2012-11-13 07:43:48 -0800 |
| commit | 6de7634357c8db3d74863e799d57ae029846f35c (patch) | |
| tree | bcd44c5d88e9edf21bbcd4cfe7e7381dcb57e5c7 /src/static | |
| parent | c2253e49b61019f899cdad8ec9d1037917996bcb (diff) | |
| parent | 4c095202bdee57cb3720333fc2699a8e92fc087f (diff) | |
| download | etherpad-lite-6de7634357c8db3d74863e799d57ae029846f35c.zip | |
merged develop back in
Diffstat (limited to 'src/static')
| -rw-r--r-- | src/static/css/iframe_editor.css | 2 | ||||
| -rw-r--r-- | src/static/js/chat.js | 2 | ||||
| -rw-r--r-- | src/static/js/pad.js | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/static/css/iframe_editor.css b/src/static/css/iframe_editor.css index bca00ff4..5134fcdb 100644 --- a/src/static/css/iframe_editor.css +++ b/src/static/css/iframe_editor.css @@ -126,7 +126,7 @@ body.doesWrap { .sidedivdelayed { /* class set after sizes are set */ background-color: #eee; color: #888 !important; - border-right: 1px solid #999; + border-right: 1px solid #ccc; } .sidedivhidden { display: none; diff --git a/src/static/js/chat.js b/src/static/js/chat.js index 486c7256..4493ed15 100644 --- a/src/static/js/chat.js +++ b/src/static/js/chat.js @@ -150,7 +150,7 @@ var chat = (function() $("#chatinput").keypress(function(evt) { //if the user typed enter, fire the send - if(evt.which == 13) + if(evt.which == 13 || evt.which == 10) { evt.preventDefault(); self.send(); diff --git a/src/static/js/pad.js b/src/static/js/pad.js index fb1814b9..b665c2fb 100644 --- a/src/static/js/pad.js +++ b/src/static/js/pad.js @@ -397,6 +397,10 @@ function handshake() }); // Bind the colorpicker var fb = $('#colorpicker').farbtastic({ callback: '#mycolorpickerpreview', width: 220}); + // Bind the read only button + $('#readonlyinput').on('click',function(){ + padeditbar.setEmbedLinks(); + }); } var pad = { |