only skip sanitization on nodes that match div.inline

theonion · Jul 29, 2014 · 6f1acce · 6f1acce
1 parent 1907114
commit 6f1acce
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/build/onion-editor.js b/build/onion-editor.js
@@ -6942,7 +6942,7 @@ define('scribe-plugin-link-ui',[],function () {
 
 
  // Do not santiize blocks that match 
- if (this.config.ignoredTags[nodeName]) {
+ if (this.config.skipSanitization(node)) {
  return;
  }
 
@@ -10716,15 +10716,17 @@ define('onion-editor',[
  var ctrlKey = function (event) { return event.metaKey || event.ctrlKey; };
 
  // Allowable Tags
- var tags = {}, ignoredTags = {};
+ var tags = {}, 
+ /* if a node running throught the sanitizer passes this test, it won't get santized true */
+ skipSanitization = function(node) {
+ return ($(node).is("div.inline"));
+ };
 
  // Multiline
  if (options.multiline) {
  tags.p = {};
  tags.br = {};
  tags.hr = {};
-
- ignoredTags.div = { class:'inline' } //ignore the contents of any div
  }
 
  // Bold
@@ -10803,7 +10805,7 @@ define('onion-editor',[
 
  scribe.use(scribePluginSanitizer({
  tags: tags,
- ignoredTags: ignoredTags
+ skipSanitization: skipSanitization
  }));
 
 
@@ -10815,7 +10817,6 @@ define('onion-editor',[
  $(scribe.el).text().split(' ').length
  );
  }
- wordcount();
  setInterval(wordcount, 3000);
  }
 

diff --git a/build/onion-editor.min.js b/build/onion-editor.min.js
diff --git a/src/js/onion-editor.js b/src/js/onion-editor.js
@@ -73,15 +73,17 @@ define('onion-editor',[
  var ctrlKey = function (event) { return event.metaKey || event.ctrlKey; };
 
  // Allowable Tags
- var tags = {}, ignoredTags = {};
+ var tags = {}, 
+ /* if a node running throught the sanitizer passes this test, it won't get santized true */
+ skipSanitization = function(node) {
+ return ($(node).is("div.inline"));
+ };
 
  // Multiline
  if (options.multiline) {
  tags.p = {};
  tags.br = {};
  tags.hr = {};
-
- ignoredTags.div = { class:'inline' } //ignore the contents of any div
  }
 
  // Bold
@@ -160,7 +162,7 @@ define('onion-editor',[
 
  scribe.use(scribePluginSanitizer({
  tags: tags,
- ignoredTags: ignoredTags
+ skipSanitization: skipSanitization
  }));
 
 

diff --git a/src/js/plugins/scribe-plugin-sanitizer.js b/src/js/plugins/scribe-plugin-sanitizer.js