libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

working

Browse source
This commit is contained in:
John McLear 2015-01-21 14:55:29 +00:00
parent ce40cacafa
commit f2891e3b8b
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/static/js/ace2_inner.js
View file

@ -19,9 +19,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
var _, $, jQuery, plugins, Ace2Common, bowser;
bowser = require('./browser').browser;
var _, $, jQuery, plugins, Ace2Common;
var bowser = require('./browser').browser;
if(bowser.msie){
// Honestly fuck IE royally.
// Basically every hack we have since V11 causes a problem
@ -30,6 +30,7 @@ if(bowser.msie){
bowser.chrome = true;
}
}
Ace2Common = require('./ace2_common');
plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins');
@ -43,7 +44,6 @@ var isNodeText = Ace2Common.isNodeText,
binarySearchInfinite = Ace2Common.binarySearchInfinite,
htmlPrettyEscape = Ace2Common.htmlPrettyEscape,
noop = Ace2Common.noop;
var hooks = require('./pluginfw/hooks');
function Ace2Inner(){
@ -953,7 +953,7 @@ function Ace2Inner(){
showslinenumbers : function(value){
hasLineNumbers = !! value;
// disable line numbers on mobile devices
// if (bowser.mobile) hasLineNumbers = false;
if (bowser.mobile) hasLineNumbers = false;
setClassPresence(sideDiv, "sidedivhidden", !hasLineNumbers);
fixView();
},
@ -4657,17 +4657,17 @@ function Ace2Inner(){
for (var i = 0; i < 2; i++)
{
var newHeight = root.clientHeight;
var newWidth = root.clientWidth;
var newWidth = (browser.msie ? root.createTextRange().boundingWidth : root.clientWidth);
var viewHeight = getInnerHeight() - iframePadBottom - iframePadTop;
var viewWidth = getInnerWidth() - iframePadLeft - iframePadRight;
if (newHeight < viewHeight)
{
newHeight = viewHeight;
// if (bowser.msie) setIfNecessary(outerWin.document.documentElement.style, 'overflowY', 'auto');
if (bowser.msie) setIfNecessary(outerWin.document.documentElement.style, 'overflowY', 'auto');
}
else
{
// if (bowser.msie) setIfNecessary(outerWin.document.documentElement.style, 'overflowY', 'scroll');
if (bowser.msie) setIfNecessary(outerWin.document.documentElement.style, 'overflowY', 'scroll');
}
if (doesWrap)
{

1
src/static/js/pad.js
View file

@ -494,7 +494,6 @@ var pad = {
pad.initTime = +(new Date());
pad.padOptions = clientVars.initialOptions;
console.log("pad", browser);
if ((!browser.msie) && (!(browser.firefox && browser.version.indexOf("1.8.") == 0)))
{
document.domain = document.domain; // for comet