Repository: couchdb-fauxton Updated Branches: refs/heads/master 96f99b7c2 -> 8a49da5ca
Fix ACE document editor cutting off long lines of code Closes COUCHDB-2454 Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/8a49da5c Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/8a49da5c Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/8a49da5c Branch: refs/heads/master Commit: 8a49da5caee4e22d0ea93992352b157ecd1691c7 Parents: 96f99b7 Author: Michelle Phung <[email protected]> Authored: Fri Nov 14 11:03:45 2014 -0500 Committer: Robert Kowalski <[email protected]> Committed: Wed Nov 19 13:46:00 2014 +0100 ---------------------------------------------------------------------- app/addons/documents/assets/less/documents.less | 6 +++++- app/addons/documents/views-doceditor.js | 1 + app/addons/fauxton/base.js | 1 + app/addons/fauxton/components.js | 8 ++++++++ app/constants.js | 3 ++- 5 files changed, 17 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8a49da5c/app/addons/documents/assets/less/documents.less ---------------------------------------------------------------------- diff --git a/app/addons/documents/assets/less/documents.less b/app/addons/documents/assets/less/documents.less index 8e730b5..bc71274 100644 --- a/app/addons/documents/assets/less/documents.less +++ b/app/addons/documents/assets/less/documents.less @@ -100,11 +100,15 @@ button.beautify { } #editor-container { - width: 1316px; height: 688px; + width: 100%; font-size: 16px; } +.editor-content-page { + padding-right: 20px; +} + button.string-edit { position: absolute; padding: 0; http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8a49da5c/app/addons/documents/views-doceditor.js ---------------------------------------------------------------------- diff --git a/app/addons/documents/views-doceditor.js b/app/addons/documents/views-doceditor.js index aa27b66..0260134 100644 --- a/app/addons/documents/views-doceditor.js +++ b/app/addons/documents/views-doceditor.js @@ -204,6 +204,7 @@ function (app, FauxtonAPI, Components, Documents, Databases, resizeColumns, pret /* Document editor*/ Views.CodeEditor = FauxtonAPI.View.extend({ template: 'addons/documents/templates/code_editor', + className: 'editor-content-page', events: { 'click button.save-doc': 'saveDoc', 'click button.delete': 'destroy', http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8a49da5c/app/addons/fauxton/base.js ---------------------------------------------------------------------- diff --git a/app/addons/fauxton/base.js b/app/addons/fauxton/base.js index 3add6e5..4f82c40 100644 --- a/app/addons/fauxton/base.js +++ b/app/addons/fauxton/base.js @@ -133,6 +133,7 @@ function(app, FauxtonAPI, resizeColumns, Components, ZeroClipboard) { var $selectorList = $('body'); $selectorList.toggleClass('closeMenu'); this.resizeColumns.onResizeHandler(); + FauxtonAPI.Events.trigger(FauxtonAPI.constants.EVENT_BURGER_CLICK); }, // TODO: can we generate this list from the router? http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8a49da5c/app/addons/fauxton/components.js ---------------------------------------------------------------------- diff --git a/app/addons/fauxton/components.js b/app/addons/fauxton/components.js index 1f4e8a0..ed28b1e 100644 --- a/app/addons/fauxton/components.js +++ b/app/addons/fauxton/components.js @@ -761,6 +761,14 @@ function(app, FauxtonAPI, ace, spin, ZeroClipboard) { return 'Your changes have not been saved. Click cancel to return to the document.'; } }); + + var resizeEditor = _.debounce(function () { + that.editor.resize(true); + }, 500); + + $(window).resize(resizeEditor); + this.listenTo(FauxtonAPI.Events, FauxtonAPI.constants.EVENT_BURGER_CLICK, resizeEditor); + }, cleanup: function () { http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8a49da5c/app/constants.js ---------------------------------------------------------------------- diff --git a/app/constants.js b/app/constants.js index 2e57536..9fa318e 100644 --- a/app/constants.js +++ b/app/constants.js @@ -18,7 +18,8 @@ define([], function () { // events EVENT_TRAY_CLOSED: 'tray:closed', - EVENT_TRAY_OPENED: 'tray:opened' + EVENT_TRAY_OPENED: 'tray:opened', + EVENT_BURGER_CLICKED: 'burger:clicked' }; return constants;
