improving error message, removing jsonp

gulpfile.js

@@ -127,25 +127,27 @@ gulp.task('serve', ['watch', 'sample'], function(){
       // return feed information - number of Entries configured by request
       feedparser.on('end', function () {
         if (feedError) {
-          resp.writeHead(400, error.toString());
+          resp.writeHead(400, feedError.toString());
           resp.end();
         } else {
           var numberOfEntries = queryParams.num;
           feedEntries = feedEntries.slice(0, numberOfEntries);
 
           var feed = {feed: {entries: feedEntries, title: feedTitle, description: feedDescription, link: feedLink}};
 
-          var callbackName = queryParams.callback;
-          if (!callbackName) {
-            callbackName = 'jsonp_callback';
-          }
-
           resp.writeHead(200);
-          resp.write('/**/ typeof ' + callbackName + ' === "function" && ');
-          resp.write(callbackName + '(');
-          resp.write(JSON.stringify(feed));
-          resp.write(');');
 
+          var callbackName = queryParams.callback;
+          if (callbackName) {
+            resp.write('/**/ typeof ' + callbackName + ' === "function" && ');
+            resp.write(callbackName + '(');
+            resp.write(JSON.stringify(feed));
+            resp.write(');');
+          } else {
+            resp.write(JSON.stringify(feed));
+          }
+
+
           resp.end();
         }
       });

sample/index.html

@@ -51,7 +51,7 @@
     <script type="text/javascript">
       angular
        .module('adfWidgetSample', ['adf', 'adf.widget.news', 'LocalStorageModule'])
-       .constant('newsServiceUrl', '/feed?callback=JSON_CALLBACK&url=')
+       .constant('newsServiceUrl', '/feed?url=')
        .config(function(dashboardProvider, localStorageServiceProvider){
          localStorageServiceProvider.setPrefix('adf.news');
          dashboardProvider.structure('4-8', {

src/edit.html

@@ -1,7 +1,7 @@
 <form role="form">
   <div class="form-group">
-    <label for="url">Feed url</label>
-    <input type="url" class="form-control" id="url" ng-model="config.url" placeholder="Enter feed url">
+    <label for="url">Feed URL</label>
+    <input type="url" class="form-control" id="url" ng-model="config.url" placeholder="Enter feed URL">
   </div>
   <div class="form-group">
     <label for="num">Number of Entries</label>

src/service.js

@@ -28,7 +28,6 @@ angular.module('adf.widget.news')
   .service('NewsService', NewsService);
 
 function NewsService($q, $http, newsServiceUrl){
-
   function createUrl(config){
     if (!config.num){
       config.num = 5;
@@ -38,17 +37,17 @@ function NewsService($q, $http, newsServiceUrl){
 
   function loadFeed(config){
     var deferred = $q.defer();
-    $http.jsonp(createUrl(config))
+    $http.get(createUrl(config))
       .success(function(data){
         if (data && data.feed){
           deferred.resolve(data.feed);
         } else {
           deferred.reject('response does not contain feed element');
         }
       })
-      .error(function(err){
-        deferred.reject(err);
-      });
+      .catch(function(response) {
+       deferred.reject('Service returned ' + response.status + ' --> ' + response.statusText);
+    });
     return deferred.promise;
   }
 

src/view.html

@@ -1,6 +1,6 @@
 <div class="news">
   <div class="alert alert-info" ng-if="!vm.feed">
-    Please insert a feed url in the widget configuration
+    Please insert a feed URL in the widget configuration
   </div>
   <div ng-if="vm.feed">
     <h3 ng-if="config.showTitle">