sanitize improvements

flaming-cl · Apr 22, 2017 · 49a4290 · 49a4290
1 parent bff230e
commit 49a4290
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 14 deletions.
diff --git a/codex-editor.js b/codex-editor.js
diff --git a/codex-editor.js.map b/codex-editor.js.map
diff --git a/modules/callbacks.js b/modules/callbacks.js
@@ -3,7 +3,7 @@
  * @description Module works with editor added Elements
  *
  * @author Codex Team
- * @version 1.3.12
+ * @version 1.4.0
  */
 
 module.exports = (function (callbacks) {
@@ -933,7 +933,6 @@ module.exports = (function (callbacks) {
 
         /** Temporary DIV that is used to work with childs as arrays item */
         var div     = editor.draw.node('DIV', '', {}),
-            cleaner = new editor.sanitizer.init(),
             cleanData,
             fragment;
 
@@ -942,7 +941,8 @@ module.exports = (function (callbacks) {
 
         if ( htmlData.trim() != '' ) {
 
-            cleanData = cleaner.clean(htmlData);
+            console.log('here');
+            cleanData = editor.sanitizer.clean(htmlData);
             div.innerHTML = cleanData;
 
         } else {

diff --git a/modules/sanitizer.js b/modules/sanitizer.js
@@ -48,14 +48,30 @@ module.exports = (function (sanitizer) {
 
     sanitizer.Config = Config;
 
-    sanitizer.init = function () {
+    let init_ = function (userCustomConfig) {
 
-        let configuration = Config.CUSTOM || Config.BASIC;
+        let configuration = userCustomConfig || Config.CUSTOM || Config.BASIC;
+        console.log(configuration);
 
         return new janitor(configuration);
 
     };
 
+    /**
+     * Cleans string from unwanted tags
+     * @protected
+     * @param {String} dirtyString - taint string
+     * @param {Object} customConfig - allowed tags
+     */
+    sanitizer.clean = function(dirtyString, customConfig) {
+
+        console.log('her');
+        let janitorInstance = init_(customConfig);
+
+        return janitorInstance.clean(dirtyString);
+
+    };
+
     return sanitizer;
 
 })({});
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codex.editor",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "Codex Editor. Native JS, based on API and Open Source",
   "main": "index.js",
   "scripts": {

diff --git a/webpack.config.js b/webpack.config.js
@@ -26,7 +26,6 @@ var ExtractTextWebpackPlugin    = require('extract-text-webpack-plugin');
 module.exports = {
 
     entry: {
-        "whatwg-fetch": "whatwg-fetch",
         "codex-editor": "./codex"
     },
     output: {
@@ -37,7 +36,7 @@ module.exports = {
     watch: true,
 
     watchOptions: {
-        aggregateTimeOut: 100
+        aggregateTimeOut: 50
     },
 
     devtool: NODE_ENV == 'development' ? "source-map" : null,

diff --git a/whatwg-fetch.js b/whatwg-fetch.js
diff --git a/whatwg-fetch.js.map b/whatwg-fetch.js.map