fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility

This commit is contained in:
John McLear 2015-04-06 13:19:42 +01:00
parent e027083136 a5aa58e28b
commit 7e99724fec
4 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/installDeps.sh
View File

@ -103,7 +103,7 @@ if [ $DOWNLOAD_JQUERY = "true" ]; then
fi
#Remove all minified data to force node creating it new
echo "Clear minfified cache..."
echo "Clearing minified cache..."
rm -f var/minified*
echo "Ensure custom css/js files are created..."

24
src/package.json
View File

@ -13,25 +13,25 @@
],
"dependencies" : {
"etherpad-yajsml" : "0.0.2",
"request" : "2.53.0",
"request" : "2.55.0",
"etherpad-require-kernel" : "1.0.8",
"resolve" : "1.1.0",
"socket.io" : "1.3.3",
"ueberDB" : "0.2.14",
"resolve" : "1.1.6",
"socket.io" : "1.3.5",
"ueberDB" : "0.2.15",
"express" : "3.8.1",
"async" : "0.9.0",
"connect" : "2.7.11",
"clean-css" : "3.0.8",
"uglify-js" : "2.4.16",
"formidable" : "1.0.16",
"clean-css" : "3.1.9",
"uglify-js" : "2.4.19",
"formidable" : "1.0.17",
"log4js" : "0.6.22",
"cheerio" : "0.18.0",
"cheerio" : "0.19.0",
"async-stacktrace" : "0.0.2",
"npm" : "2.4.1",
"npm" : "2.7.5",
"ejs" : "1.0.0",
"graceful-fs" : "3.0.5",
"graceful-fs" : "3.0.6",
"slide" : "1.1.6",
"semver" : "4.2.0",
"semver" : "4.3.3",
"security" : "1.0.0",
"tinycon" : "0.0.1",
"underscore" : "1.5.1",
@ -41,7 +41,7 @@
"channels" : "0.0.4",
"jsonminify" : "0.2.3",
"measured" : "1.0.0",
"mocha" : "2.1.0",
"mocha" : "2.2.1",
"supertest" : "0.15.0"
},
"bin": { "etherpad-lite": "./node/server.js" },

13
src/static/css/iframe_editor.css
View File

@ -98,7 +98,18 @@ body.grayedout { background-color: #eee !important }
}
body.doesWrap {
white-space: pre-wrap; /*Must be pre-wrap to keep trailing spaces. Otherwise you get a zombie caret, walking around your screen (see #1766), WARNING: Enabling this causes Paste as plain text in Chrome to remove line breaks, this is probably undesirable */
/* white-space: pre-wrap; */
/*
Must be pre-wrap to keep trailing spaces. Otherwise you get a zombie caret,
walking around your screen (see #1766).
WARNING: Enabling this causes Paste as plain text in Chrome to remove line breaks
this is probably undesirable
WARNING: This causes copy & paste events to lose bold etc. attributes
NOTE: The walking-zombie caret issue seems to have been fixed in FF upstream
so let's try diabling pre-wrap and see how we get on now.
For more details see: https://github.com/ether/etherpad-lite/issues/2574
*/
word-wrap: break-word; /* fix for issue #1648 - firefox not wrapping long lines (without spaces) correctly */
}

5
src/static/js/ace2_inner.js
View File

@ -608,8 +608,11 @@ function Ace2Inner(){
// Chrome can't handle the truth.. If CSS rule white-space:pre-wrap
// is true then any paste event will insert two lines..
// Sadly this will mean you get a walking Caret in Chrome when clicking on a URL
// So this has to be set to pre-wrap ;(
// We need to file a bug w/ the Chromium team.
if(browser.chrome){
$("#innerdocbody").css({"white-space":"normal"});
$("#innerdocbody").css({"white-space":"pre-wrap"});
}
}