editor: refactoring canvas markup

diff --git a/src/editor/modules/documentCanvas/canvas/canvas.html b/src/editor/modules/documentCanvas/canvas/canvas.html
new file mode 100644 (file)
index 0000000..d798fd2
--- /dev/null
+++ b/src/editor/modules/documentCanvas/canvas/canvas.html
@@ -0,0 +1,5 @@
+<div class="view-table">
+    <div class="view-row">
+        <div class="root-wrapper" contenteditable="true"></div>
+    </div>
+</div>
\ No newline at end of file

diff --git a/src/editor/modules/documentCanvas/canvas/canvas.js b/src/editor/modules/documentCanvas/canvas/canvas.js
index 3bf6b51..ab31ee1 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/canvas.js
+++ b/src/editor/modules/documentCanvas/canvas/canvas.js
@@ -11,7 +11,8 @@ define([
 'modules/documentCanvas/canvas/genericElement',
 'modules/documentCanvas/canvas/nullElement',
 'modules/documentCanvas/canvas/gutter',
 'modules/documentCanvas/canvas/genericElement',
 'modules/documentCanvas/canvas/nullElement',
 'modules/documentCanvas/canvas/gutter',

-], function($, _, Backbone, logging, documentElement, keyboard, utils, wlxmlListener, ElementsRegister, genericElement, nullElement, gutter) {
+'libs/text!./canvas.html'
+], function($, _, Backbone, logging, documentElement, keyboard, utils, wlxmlListener, ElementsRegister, genericElement, nullElement, gutter, canvasTemplate) {

     
 'use strict';
 /* global document:false, window:false, Node:false, gettext */
     
 'use strict';
 /* global document:false, window:false, Node:false, gettext */


@@ -75,13 +76,13 @@ var Canvas = function(wlxmlDocument, elements) {
     }.bind(this));
     this.eventBus = _.extend({}, Backbone.Events);
     
     }.bind(this));
     this.eventBus = _.extend({}, Backbone.Events);
     

-    this.wrapper = $('<div style="display: table; width: 96%"><div style="display: table-row" class="crow"></div></div>');
+    this.dom = $(canvasTemplate);
+    this.rootWrapper = this.dom.find('.root-wrapper');

     
 
     this.gutter = gutter.create();
     this.gutterView = new gutter.GutterView(this.gutter);
     
 
     this.gutter = gutter.create();
     this.gutterView = new gutter.GutterView(this.gutter);

-    this.rootWrapper = $('<div>').addClass('canvas-wrapper').attr('contenteditable', true);
-    this.wrapper.find('.crow').append(this.rootWrapper, this.gutterView.dom);
+    this.dom.find('.view-row').append(this.gutterView.dom);

     
     this.wlxmlListener = wlxmlListener.create(this);
     this.loadWlxmlDocument(wlxmlDocument);
     
     this.wlxmlListener = wlxmlListener.create(this);
     this.loadWlxmlDocument(wlxmlDocument);


@@ -92,7 +93,7 @@ var Canvas = function(wlxmlDocument, elements) {
 $.extend(Canvas.prototype, Backbone.Events, {
 
     getElementOffset: function(element) {
 $.extend(Canvas.prototype, Backbone.Events, {
 
     getElementOffset: function(element) {

-        return element.dom.offset().top - this.wrapper.offset().top;
+        return element.dom.offset().top - this.dom.offset().top;

     },
 
     loadWlxmlDocument: function(wlxmlDocument) {
     },
 
     loadWlxmlDocument: function(wlxmlDocument) {


@@ -205,7 +206,7 @@ $.extend(Canvas.prototype, Backbone.Events, {
                         mutation.target.data = mutation.target.data.replace(utils.unicode.ZWS, '');
                         canvas._moveCaretToTextElement(canvas.getDocumentElement(mutation.target), 'end');
                     }
                         mutation.target.data = mutation.target.data.replace(utils.unicode.ZWS, '');
                         canvas._moveCaretToTextElement(canvas.getDocumentElement(mutation.target), 'end');
                     }

-                    observer.observe(canvas.wrapper[0], config);
+                    observer.observe(canvas.dom[0], config);

 
                     var textElement = canvas.getDocumentElement(mutation.target),
                         toSet = mutation.target.data !== utils.unicode.ZWS ? mutation.target.data : '';
 
                     var textElement = canvas.getDocumentElement(mutation.target),
                         toSet = mutation.target.data !== utils.unicode.ZWS ? mutation.target.data : '';


@@ -249,7 +250,7 @@ $.extend(Canvas.prototype, Backbone.Events, {
     },
 
     view: function() {
     },
 
     view: function() {

-        return this.wrapper;
+        return this.dom;

     },
 
     doc: function() {
     },
 
     doc: function() {

diff --git a/src/editor/modules/documentCanvas/canvas/canvas.less b/src/editor/modules/documentCanvas/canvas/canvas.less
new file mode 100644 (file)
index 0000000..934aff8
--- /dev/null
+++ b/src/editor/modules/documentCanvas/canvas/canvas.less
@@ -0,0 +1,8 @@
+.view-table {
+    display: table;
+    width: 96%;
+    
+    .view-row {
+        display: table-row;
+    }
+}

diff --git a/src/editor/modules/documentCanvas/documentCanvas.less b/src/editor/modules/documentCanvas/documentCanvas.less
index d1042c2..1297d73 100644 (file)
--- a/src/editor/modules/documentCanvas/documentCanvas.less
+++ b/src/editor/modules/documentCanvas/documentCanvas.less
@@ -1,4 +1,5 @@
 @import 'nodes.less';
 @import 'nodes.less';

+@import 'canvas/canvas.less';

 @import 'canvas/documentElement.less';
 @import 'canvas/genericElement.less';
 @import 'canvas/gutter.less';
 @import 'canvas/documentElement.less';
 @import 'canvas/genericElement.less';
 @import 'canvas/gutter.less';


@@ -31,7 +32,7 @@
         .rng-mixin-scrollbar-thumb-window-inactive;
     }
     
         .rng-mixin-scrollbar-thumb-window-inactive;
     }
     

-    .canvas-wrapper {
+    .root-wrapper {

         display: table-cell;
         vertical-align: top;
         width:800px;
         display: table-cell;
         vertical-align: top;
         width:800px;