Commit 215681bb authored by Arnaud Fontaine's avatar Arnaud Fontaine

erp5_code_mirror: 'viewportMargin: Infinity' is too slow with files with > 1000 lines.

This was initially set to 'Infinity' to allow browser search but this make the
editor completely unusable with big files.
parent 54087b03
...@@ -484,7 +484,6 @@ ...@@ -484,7 +484,6 @@
tabSize: 2,\n tabSize: 2,\n
indentWithTabs: false,\n indentWithTabs: false,\n
matchBrackets: true,\n matchBrackets: true,\n
viewportMargin: Infinity,\n
extraKeys: {"Ctrl-Space": "autocomplete",\n extraKeys: {"Ctrl-Space": "autocomplete",\n
"Ctrl-Q": function(cm){cm.foldCode(cm.getCursor());},\n "Ctrl-Q": function(cm){cm.foldCode(cm.getCursor());},\n
"Ctrl-S": function(cm){saveDocument(cm, $.Event(\'click\'))}},\n "Ctrl-S": function(cm){saveDocument(cm, $.Event(\'click\'))}},\n
...@@ -532,7 +531,6 @@ ...@@ -532,7 +531,6 @@
lineNumbers: true,\n lineNumbers: true,\n
showTrailingSpace: true,\n showTrailingSpace: true,\n
matchBrackets: true,\n matchBrackets: true,\n
/* viewportMargin: Infinity, */\n
extraKeys: {"Ctrl-Space": "autocomplete",\n extraKeys: {"Ctrl-Space": "autocomplete",\n
"Ctrl-Q": function(cm){cm.foldCode(cm.getCursor());},\n "Ctrl-Q": function(cm){cm.foldCode(cm.getCursor());},\n
"Ctrl-S": function(cm){saveDocument(merge_mode_elem.edit, $.Event(\'click\'))}},\n "Ctrl-S": function(cm){saveDocument(merge_mode_elem.edit, $.Event(\'click\'))}},\n
......
2015-05-08 arnaud.fontaine
* 'viewportMargin: Infinity' is too slow with files with > 1000 lines.
2015-05-08 arnaud.fontaine 2015-05-08 arnaud.fontaine
* Rename 'edit' addon to 'cm_edit' to prevent conflict with ERP5 'edit()' method preventing update of the bt5. * Rename 'edit' addon to 'cm_edit' to prevent conflict with ERP5 'edit()' method preventing update of the bt5.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment