Test suite now relies on requirejs as well
diff --git a/dev/js/src/vc/doc.js b/dev/js/src/vc/doc.js
index 61c6439..700f410 100644
--- a/dev/js/src/vc/doc.js
+++ b/dev/js/src/vc/doc.js
@@ -133,7 +133,7 @@
// Wrap a new operation around the doc element
wrap : function (op) {
var parent = this.parent();
- var group = KorAP.DocGroup.create(parent);
+ var group = require('vc/docgroup').create(parent);
group.operation(op);
group.append(this);
group.append();
@@ -353,7 +353,7 @@
return string + '/' + this.value() + '/';
break;
case "string":
- return string + '"' + this.value().replace(KorAP._quote, '\\$1') + '"';
+ return string + '"' + this.value().quote() + '"';
break;
};
diff --git a/dev/js/src/vc/operators.js b/dev/js/src/vc/operators.js
index 312f75d..9b0ebd1 100644
--- a/dev/js/src/vc/operators.js
+++ b/dev/js/src/vc/operators.js
@@ -50,19 +50,19 @@
// Add doc with 'and' relation
- var _and = function () {
+ KorAP._and = function () {
return _add(this, 'and');
};
// Add doc with 'or' relation
- var _or = function () {
+ KorAP._or = function () {
return _add(this, 'or');
};
// Remove doc or docGroup
- var _delete = function () {
+ KorAP._delete = function () {
var ref = this.parentNode.refTo;
if (ref.parent().ldType() !== null) {
return ref.parent().delOperand(ref).update();
@@ -98,7 +98,7 @@
if (this._and === true) {
var andE = document.createElement('span');
andE.setAttribute('class', 'and');
- andE.addEventListener('click', _and, false);
+ andE.addEventListener('click', KorAP._and, false);
andE.appendChild(
document.createTextNode(loc.AND)
);
@@ -109,7 +109,7 @@
if (this._or === true) {
var orE = document.createElement('span');
orE.setAttribute('class', 'or');
- orE.addEventListener('click', _or, false);
+ orE.addEventListener('click', KorAP._or, false);
orE.appendChild(document.createTextNode(loc.OR));
op.appendChild(orE);
};
@@ -119,7 +119,7 @@
var delE = document.createElement('span');
delE.setAttribute('class', 'delete');
delE.appendChild(document.createTextNode(loc.DEL));
- delE.addEventListener('click', _delete, false);
+ delE.addEventListener('click', KorAP._delete, false);
op.appendChild(delE);
};
diff --git a/dev/js/src/vc/rewrite.js b/dev/js/src/vc/rewrite.js
index 79ba4b3..f0dfe34 100644
--- a/dev/js/src/vc/rewrite.js
+++ b/dev/js/src/vc/rewrite.js
@@ -4,7 +4,6 @@
define(['vc/jsonld', 'util'], function (jsonldClass) {
var _validRewriteOpRE = new RegExp("^(?:injec|modifica)tion$");
- var _quote = new RegExp("([\"\\\\])", 'g');
return {
// Construction method
@@ -87,12 +86,12 @@
this._scope === null ?
'object' :
'"' +
- this.scope().replace(_quote, '\\$1') +
+ this.scope().quote() +
'"'
);
str += ' by ' +
'"' +
- this.src().replace(_quote, '\\$1') +
+ this.src().quote() +
'"';
return str;
}