Changeset 1149615

Timestamp:

04/29/2015 11:05:50 PM (11 years ago)

Author:

guavaworks

Message:

Adding HTML Janitor for sanitation - 1.2.2

Location:

angularjs-for-wp/trunk

Files:

• angularjs-templates/list-detail.html (modified) (1 diff)
• angularjs-templates/post-content.html (modified) (1 diff)
• angularjs-templates/single-detail.html (modified) (1 diff)
• includes/contentFilter.php (modified) (1 diff)
• js/angular-app.js (modified) (1 diff)
• js/html-janitor.js (added)
• plugin.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)

angularjs-for-wp/trunk/angularjs-templates/list-detail.html

@@ -36 +36 @@
 <article>
     <h2>{{post.title}}</h2>
-    <div ng-bind-html="post.content | unsafe"></div>
+    <div ng-bind-html="post.content | sanitize"></div>
     <a href="{{post.link}}">Read More...</a>
     <hr />

angularjs-for-wp/trunk/angularjs-templates/post-content.html

@@ -2 +2 @@
 unlike other templates, you must use post.content_raw for this template.
 -->
-
-<div ng-bind-html="content | unsafe"></div>
+<pre>{{content | json }}</pre>
+<div ng-bind-html='content | sanitize'></div>

angularjs-for-wp/trunk/angularjs-templates/single-detail.html

@@ -36 +36 @@
 <article>
     <h2>{{post.title}}</h2>
-    <div ng-bind-html="post.content | unsafe"></div>
+    <div ng-bind-html="post.content | sanitize"></div>
     <a href="{{post.link}}">Read More...</a>
     <hr />

angularjs-for-wp/trunk/includes/contentFilter.php

@@ -6 +6 @@
     $meta = get_post_meta($post->ID, 'angularjsLoad', true);
     $meta = intval($meta);
-
+    $content = str_replace('"', '\'', $content );
+            
     if($meta){
         $content = '<div ng-app="wpAngularPlugin"><ng-post-content id="'.$post->ID.'" content="'.$content.'"></ng-post-content></div>';

angularjs-for-wp/trunk/js/angular-app.js

@@ -1 +1 @@
 var angular_app = angular.module('wpAngularPlugin', ['ngSanitize']);
 
-angular_app.filter('unsafe', function($sce) {
-    return function(val) {
-        if( $sce.trustAsHtml(val) )
-            return $sce.trustAsHtml(val).toString();
+angular_app.filter('unsafe', function ($sce) {
+    return function (val) {
+        return $sce.trustAsHtml(val);
+    };
+});
+
+var janitor = new HTMLJanitor({
+    tags: {
+        div: {
+            id: true,
+            class: true
+        },
+        p: {
+            id: true,
+            class: true
+        },
+        code: {},
+        pre: {},
+        // TODO: Map b => strong
+        strong: {},
+        b: {},
+        // TODO: Map em => i
+        em: {},
+        i: {},
+        // TODO: Map strike => del
+        strike: {},
+        del: {},
+        a: { href: true },
+        ul: {},
+        ol: {},
+        li: {},
+        blockquote: {},
+        h1: {},
+        h2: {},
+        h3: {},
+        h4: {},
+        h5: {},
+        h6: {},
+        sub: {},
+        sup: {}
+    }
+});
+
+angular_app.filter('sanitize', function (unsafeFilter) {
+    return function (val) {
+        return unsafeFilter(janitor.clean(val));
     };
 });

angularjs-for-wp/trunk/plugin.php

@@ -4 +4 @@
  * Plugin URI: http://www.roysivan.com/angularjs-for-wordpress
  * Description: This plugin will allow you to easily load WordPress content client-side using AngularJS. JSON REST API required.
- * Version: 1.2.1
+ * Version: 1.2.2
  * Author: Roy Sivan
  * Author URI: http://www.roysivan.com
@@ -14 +14 @@
 require_once('includes/shortcodes.php');
 
-define('WordPressAngularJS', '1.2');
+define('WordPressAngularJS', '1.2.2');
 
 class WordPressAngularJS {
@@ -27 +27 @@
         wp_enqueue_script('angular-core', plugin_dir_url( __FILE__ ).'js/angular.min.js', array('jquery'), null, false);
         wp_enqueue_script('angular-sanitize', plugin_dir_url( __FILE__ ).'js/angular-sanitize.min.js', array('jquery'), null, false);
-        wp_enqueue_script('angular-app', plugin_dir_url( __FILE__ ).'js/angular-app.js', array('jquery'), null, false);
+        wp_enqueue_script('html-janitor', plugin_dir_url( __FILE__ ).'js/html-janitor.js', array('jquery'), null, false);
+        
+        wp_enqueue_script('angular-app', plugin_dir_url( __FILE__ ).'js/angular-app.js', array('html-janitor'), null, false);
 
         // Angular Factories

angularjs-for-wp/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.9
 Tested up to: 4.2.1
-Stable tag: 1.2.1
+Stable tag: 1.2.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -70 +70 @@
 = 1.2.1 =
 * Child Theme Support
+
+= 1.2.2 =
+* Adding in HTML Janitor - [fixing issue](https://github.com/royboy789/angularjs-for-wordpress/issues/6)