Merge pull request #452 from ethereum/editor-dom

Remove DOM dependency of editor API
pull/1/head
yann300 8 years ago committed by GitHub
commit a6ece05c5e
  1. 4
      src/app.js
  2. 10
      src/app/editor.js

@ -157,7 +157,7 @@ var run = function () {
// ----------------- editor ---------------------- // ----------------- editor ----------------------
var editor = new Editor() var editor = new Editor(document.getElementById('input'))
// ----------------- tabbed menu ------------------- // ----------------- tabbed menu -------------------
$('#options li').click(function (ev) { $('#options li').click(function (ev) {
@ -487,7 +487,7 @@ var run = function () {
// ----------------- editor resize --------------- // ----------------- editor resize ---------------
function onResize () { function onResize () {
editor.resize() editor.resize(document.querySelector('#editorWrap').checked)
reAdjust() reAdjust()
} }
window.onresize = onResize window.onresize = onResize

@ -6,9 +6,9 @@ var ace = require('brace')
var Range = ace.acequire('ace/range').Range var Range = ace.acequire('ace/range').Range
require('../mode-solidity.js') require('../mode-solidity.js')
function Editor () { function Editor (editorElement) {
var editor = ace.edit('input') var editor = ace.edit(editorElement)
document.getElementById('input').editor = editor // required to access the editor during tests editorElement.editor = editor // required to access the editor during tests
var event = new EventManager() var event = new EventManager()
this.event = event this.event = event
var sessions = {} var sessions = {}
@ -95,10 +95,10 @@ function Editor () {
} }
} }
this.resize = function () { this.resize = function (useWrapMode) {
editor.resize() editor.resize()
var session = editor.getSession() var session = editor.getSession()
session.setUseWrapMode(document.querySelector('#editorWrap').checked) session.setUseWrapMode(useWrapMode)
if (session.getUseWrapMode()) { if (session.getUseWrapMode()) {
var characterWidth = editor.renderer.characterWidth var characterWidth = editor.renderer.characterWidth
var contentWidth = editor.container.ownerDocument.getElementsByClassName('ace_scroller')[0].clientWidth var contentWidth = editor.container.ownerDocument.getElementsByClassName('ace_scroller')[0].clientWidth

Loading…
Cancel
Save