manifest and readme updates

vojtajina · May 7, 2012 · ed4dbe5 · ed4dbe5
1 parent f81bc9d
commit ed4dbe5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/FinalProject/README.md b/FinalProject/README.md
@@ -1,2 +1,6 @@
 wReader
 a web learning project
+
+To make this an app:
+- Add "ng-csp" to the <html> tag in index.html
+- Uncomment link 144 in apps.js
diff --git a/FinalProject/index.html b/FinalProject/index.html
@@ -26,7 +26,7 @@
        Create your own custom Modernizr build: www.modernizr.com/download/ -->
   <script src="js/libs/modernizr-2.5.3.min.js"></script>
 
-  <script src="js/libs/angular-1.0.0rc7/angular-1.0.0rc7.min.js"></script>
+  <script src="js/libs/angular-1.0.0rc7/angular-1.0.0rc7.js"></script>
 
   <base target="_blank"> <!-- This amazingness opens all links in a new tab. -->
 </head>

diff --git a/FinalProject/js/app.js b/FinalProject/js/app.js
@@ -1,7 +1,7 @@
-var wReader = angular.module('wReader', ['wReader.filters']).
-  config(['$locationProvider', function($locationProvider) {
-    $locationProvider.html5Mode(true).hashPrefix('!');
-  }]);
+var wReader = angular.module('wReader', ['wReader.filters']);
+  // config(['$locationProvider', function($locationProvider) {
+  //   $locationProvider.html5Mode(true).hashPrefix('!');
+  // }]);
   // config(['$routeProvider', function($routeProvider) {
   //   //$routeProvider.when('/view1', {template: 'partials/partial1.html', controller: MyCtrl1});
   //   //$routeProvider.when('/view2', {template: 'partials/partial2.html', controller: MyCtrl2});
@@ -141,6 +141,7 @@ function DataController($scope, $http, $filter) {
     };
 
     $http.jsonp(feedURL + '&callback=JSON_CALLBACK').success(successCallback).error(errorCallback);
+    //$http.get(feedURL).success(successCallback).error(errorCallback);
   };
 
   // Adds an item to the controller if it's not already in the controller
@@ -204,7 +205,7 @@ function DataController($scope, $http, $filter) {
 DataController.$inject = ['$scope', '$http', '$filter']; // For JS compilers.
 
 
-function ItemsController($scope, $location) {
+function ItemsController($scope) { //{, $location) {
   // A special observer that will watch for when the 'selectedItem' is updated
   // and ensure that we scroll into a view so that the selected item is visible
   // in the summary list view.
@@ -304,7 +305,7 @@ function ItemsController($scope, $location) {
   };
 }
 
-ItemsController.$inject = ['$scope', '$location'];  // For JS compilers.
+ItemsController.$inject = ['$scope'];//, '$location'];  // For JS compilers.
 //ItemsController.prototype = Object.create(DataController.prototype);
 
 // Top Menu/Nav Bar

diff --git a/FinalProject/manifest.json b/FinalProject/manifest.json
@@ -9,6 +9,7 @@
   "permissions": [
     "experimental",
     "windows",
-    "http://blog.chromium.org"
-  ]
+    "*://blog.chromium.org/feeds/*"
+  ],
+  "content_security_policy": "script-src 'self' https://blog.chromium.org; object-src 'self'"
 }