refactoring

[fnpeditor.git] / src / wlxml / extensions / list / list.js

diff --git a/src/wlxml/extensions/list/list.js b/src/wlxml/extensions/list/list.js
index 6cf875f..75b5336 100644 (file)
--- a/src/wlxml/extensions/list/list.js
+++ b/src/wlxml/extensions/list/list.js
@@ -1,13 +1,11 @@
-define(function(require) {
+define(function() {

 
 'use strict';
 
 
 'use strict';
 

+var extension = {document: {transformations: {}}, wlxmlClass: {list: {methods: {}}}};

 
 

-var wlxml = require('wlxml/wlxml'),
-    extension = {documentTransformations: [], classMethods: {}};

 
 

-
-extension.classMethods['list'] = {
+extension.wlxmlClass.list.methods = {

     itemIndex: function(listItem) {
         var toret = -1;
         this.contents('.item').some(function(item, index) {
     itemIndex: function(listItem) {
         var toret = -1;
         this.contents('.item').some(function(item, index) {


@@ -23,14 +21,21 @@ extension.classMethods['list'] = {
     }
 }
 
     }
 }
 

-extension.documentTransformations.push({
-    name: 'createList',
+extension.documentMethods = {
+    areItemsOfSameList: function(params) {
+        return params.node1.parent().sameNode(params.node2.parent()) && params.node2.parent().is('list');
+    }
+}
+
+
+
+extension.document.transformations.createList = {

     impl: function(params) {          
         var parent = params.node1.parent(),
             parentContents = parent.contents(),
             nodeIndexes = [params.node1.getIndex(), params.node2.getIndex()].sort(),
             nodesToWrap = [],
     impl: function(params) {          
         var parent = params.node1.parent(),
             parentContents = parent.contents(),
             nodeIndexes = [params.node1.getIndex(), params.node2.getIndex()].sort(),
             nodesToWrap = [],

-            listNode = params.node1.document.createDocumentNode({tagName: 'div', attrs: {'class': 'list.items'}}),
+            listNode = params.node1.document.createDocumentNode({tagName: 'div', attrs: {'class': 'list'}}),

             node, i;
 
         for(i = nodeIndexes[0]; i <= nodeIndexes[1]; i++) {
             node, i;
 
         for(i = nodeIndexes[0]; i <= nodeIndexes[1]; i++) {


@@ -65,10 +70,9 @@ extension.documentTransformations.push({
     isAllowed: function() {
         return this.args.node1.parent().sameNode(this.args.node2.parent());
     }
     isAllowed: function() {
         return this.args.node1.parent().sameNode(this.args.node2.parent());
     }

-});
+};

 
 

-extension.documentTransformations.push({
-    name: 'extractItems',
+extension.document.transformations.extractItems = {

     impl: function(params) {
         params = _.extend({}, {merge: true}, params);
         var list = params.item1.parent(),
     impl: function(params) {
         params = _.extend({}, {merge: true}, params);
         var list = params.item1.parent(),


@@ -131,7 +135,6 @@ extension.documentTransformations.push({
             reference.after(toAdd);
         }
         if(!params.merge && listIsNested) {
             reference.after(toAdd);
         }
         if(!params.merge && listIsNested) {

-            debugger;

             return this.transform('extractItems', {item1: extractedItems[0], item2: extractedItems[extractedItems.length-1]});
         }
         return true;
             return this.transform('extractItems', {item1: extractedItems[0], item2: extractedItems[extractedItems.length-1]});
         }
         return true;


@@ -140,8 +143,9 @@ extension.documentTransformations.push({
         var parent = this.args.nodel1.parent();
         return parent.is('list') && parent.sameNode(this.args.node2.parent());
     }
         var parent = this.args.nodel1.parent();
         return parent.is('list') && parent.sameNode(this.args.node2.parent());
     }

-});
+};
+
+return extension;

 
 

-wlxml.registerExtension(extension);

 
 });
\ No newline at end of file
 
 });
\ No newline at end of file