Changeset 1132529

Timestamp:

04/11/2015 05:24:16 AM (11 years ago)

Author:

guavaworks

Message:

1.2 - add sanitation - code updates

Location:

angularjs-for-wp/trunk

Files:

• angularjs-templates/post-content.html (modified) (1 diff)
• includes/contentFilter.php (modified) (1 diff)
• js/angular-app.js (modified) (2 diffs)
• js/angular-posts-directives.js (modified) (4 diffs)
• js/angular-sanitize.min.js (added)
• plugin.php (modified) (1 diff)
• readme.txt (modified) (3 diffs)

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

@@ -3 +3 @@
 -->
 
-<div ng-bind-html="post.content_raw | unsafe"></div>
+<div ng-bind-html="content | unsafe"></div>

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

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

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

@@ -1 @@
-var angular_app = angular.module('wpAngularPlugin', []);
+var angular_app = angular.module('wpAngularPlugin', ['ngSanitize']);
 
 angular_app.filter('unsafe', function($sce) {
     return function(val) {
-        return $sce.trustAsHtml(val);
+        if( $sce.trustAsHtml(val) )
+            return $sce.trustAsHtml(val).toString();
     };
 });
@@ -12 +13 @@
     });
 });
+
+angular_app.directive('ngRender', ['$compile', function ($compile) {
+    return {
+      restrict: 'E',
+      scope: {
+        html: '='
+      },
+      link: function postLink(scope, element, attrs) {
+
+          function appendHtml() {
+              if(scope.html) {
+                  var newElement = angular.element(scope.html);
+                  $compile(newElement)(scope);
+                  element.append(newElement);
+              }
+          }
+
+          scope.$watch(function() { return scope.html }, appendHtml);
+      }
+    };
+  }]);

angularjs-for-wp/trunk/js/angular-posts-directives.js

@@ -13 +13 @@
             search: '@search',
             postType: '@postType',
-            perPage: '@perPage'
+            perPage: '@perPage',
+            page: '@page'
         },
         controller: ['$scope', '$http', function($scope, $http) {
-            $scope.getPosts = function(filters, postType){
+            $scope.getPosts = function(filters, postType, page){
                 $scope.baseURL = wpAngularVars.base + '/posts?';
 
@@ -25 +26 @@
                 }
                 if(postType){
-                    $scope.baseURL = $scope.baseURL + 'type[]=' + postType;
+                    $scope.baseURL = $scope.baseURL + '&type[]=' + postType;
                 }
+                if(page){
+                        $scope.baseURL = $scope.baseURL + '&page=' + page;
+                }
                 $http.get($scope.baseURL).then(function(res){
                     $scope.postsD = res.data;
@@ -45 +49 @@
             if($scope.search) { $scope.filters.push({'filter': 's', 'value': $scope.search}); }
             if($scope.perPage) { $scope.filters.push({'filter': 'posts_per_page', 'value': $scope.perPage}); }
-            if($scope.page) { $scope.filters.push({'filter': 'posts_per_page', 'value': $scope.page}); }
-                    
+            if($scope.page) { $scope.filters.push({'filter': 'posts_per_page', 'value': $scope.page}); }    
+            
             $scope.getPosts($scope.filters, $scope.postType);
         },
@@ -79 +83 @@
         restrict: 'E',
         scope: {
-            id: '='
+            id: '=',
+            content: '@'
         },
-        controller: ['$scope', '$http', function($scope, $http) {
-            $scope.getPost = function(id) {
-            $http.get(wpAngularVars.base + '/posts/' + id + '?context=edit&_wp_json_nonce=' + wpAngularVars.nonce).then(function(res){
-                $scope.post = res.data;
-            });
-        }
-    }],
-    link: function($scope, $elm, attrs, ctrl){
-        $scope.getPost($scope.id);
-    },
         template: '<div class="ngSingleWrapper"><ng-include src="\''+wpAngularVars.template_directory.post_content+'\'"></ng-include></div>'
     }
 }]);
+
 
 angular_app.directive('ngNewPost', ['$http', '$rootScope', function($http, $rootScope){

angularjs-for-wp/trunk/plugin.php

@@ -26 +26 @@
         // Angular Core
         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);
 

angularjs-for-wp/trunk/readme.txt

@@ -15 +15 @@
 AngularJS for WordPress was created to help anyone leverage the power of AngularJS and easily add it into their own theme.  
   
-AngularJS is a client-side template framework that lets you extend HTML vocabulary for your applications. It has a markup more similar to what HTML used to be. HTML its not a dynamic language
-by itself, with AngularJS it is.
+AngularJS is a client-side template framework that lets you extend HTML vocabulary for your applications. It has a markup more similar to what HTML used to be. HTML its not a dynamic language by itself, with AngularJS it is.
   
 AngularJS for WordPress includes several directives (html elements) that will help you easily add in a block for a single post/page or a list. More directives will be added in.
@@ -23 +22 @@
   
 For even easier use for specific pages a new post meta box has been added. If selected the AngularJS directive will take over loading the content of the page client-side. This feature uses the post-content.html template.
-  
+
 View [documentation](http://www.roysivan.com/angularjs-for-wordpress) for how to utilize the directives and shortcodes
-
 
 == Installation ==
@@ -67 +65 @@
 * Added Taxonomy and post type to new post creation
 
-=1.1.2=
+= 1.2 =
 * Fix for new post template [fixing issue](https://wordpress.org/support/topic/template-override-for-new-posthtml-appears-to-not-be-working?replies=2#post-6635530)
-  
- =1.2=
- * No more global Angular App - redefined app to be more modular friendly