Move set/unset feed editing code to controller

4 files changed, 25 insertions, 29 deletions

diff --git a/js/app/controllers/itemcontroller.coffee b/js/app/controllers/itemcontroller.coffee
index c9a97285f..cc9898397 100644
--- a/js/app/controllers/itemcontroller.coffee
+++ b/js/app/controllers/itemcontroller.coffee
@@ -37,6 +37,15 @@ Language, AutoPageLoading) ->
 			@_$scope.itemBusinessLayer = @_itemBusinessLayer
 			@_$scope.feedBusinessLayer = @_feedBusinessLayer
 
+			@_$scope.edit = (feedId) =>
+				feed = @_feedModel.getById(feedId)
+				feed.editing = true
+				feed.originalValue = feed.title
+
+			@_$scope.cancel = (feedId) =>
+				feed = @_feedModel.getById(feedId)
+				feed.editing = false
+				feed.title = feed.originalValue                                 
 
 			@_$scope.isLoading = =>
 				return @_feedLoading.isLoading()
diff --git a/js/app/services/businesslayer/feedbusinesslayer.coffee b/js/app/services/businesslayer/feedbusinesslayer.coffee
index b19a8410d..03ff178dd 100644
--- a/js/app/services/businesslayer/feedbusinesslayer.coffee
+++ b/js/app/services/businesslayer/feedbusinesslayer.coffee
@@ -66,18 +66,6 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, NewestItem)->
 			@_persistence.deleteFeed(feedId)
 
 
-		renameFeedSet: (feedId) ->
-                        feed = @_feedModel.getById(feedId)
-                        feed.titleOrig = feed.title
-                        feed.editing = true
-
-
-		renameFeedUnset: (feedId) ->
-                        feed = @_feedModel.getById(feedId)
-                        feed.title = feed.titleOrig
-                        feed.editing = false
-
-
 		renameFeed: (feedId, feedTitle) ->
                         feed = @_feedModel.getById(feedId)
                         feed.editing = false
diff --git a/js/public/app.js b/js/public/app.js
index 614e497c1..879d83f7c 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -807,6 +807,18 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
           this._autoPaging = true;
           this._$scope.itemBusinessLayer = this._itemBusinessLayer;
           this._$scope.feedBusinessLayer = this._feedBusinessLayer;
+          this._$scope.edit = function(feedId) {
+            var feed;
+            feed = _this._feedModel.getById(feedId);
+            feed.editing = true;
+            return feed.originalValue = feed.title;
+          };
+          this._$scope.cancel = function(feedId) {
+            var feed;
+            feed = _this._feedModel.getById(feedId);
+            feed.editing = false;
+            return feed.title = feed.originalValue;
+          };
           this._$scope.isLoading = function() {
             return _this._feedLoading.isLoading();
           };
@@ -1107,20 +1119,6 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
           return this._persistence.deleteFeed(feedId);
         };
 
-        FeedBusinessLayer.prototype.renameFeedSet = function(feedId) {
-          var feed;
-          feed = this._feedModel.getById(feedId);
-          feed.titleOrig = feed.title;
-          return feed.editing = true;
-        };
-
-        FeedBusinessLayer.prototype.renameFeedUnset = function(feedId) {
-          var feed;
-          feed = this._feedModel.getById(feedId);
-          feed.title = feed.titleOrig;
-          return feed.editing = false;
-        };
-
         FeedBusinessLayer.prototype.renameFeed = function(feedId, feedTitle) {
           var feed;
           feed = this._feedModel.getById(feedId);
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index a78da8576..157d69c2a 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -17,10 +17,10 @@
 		revert: true
 	}">
 
-	<div ui-if="feed.editing" class="rename-feed">
+	<div ui-if="feed.editing" class="rename-feed" ng-controller="ItemController">
           <input type="text" ng-model="feed.title" autofocus>
           <button title="<?php p($l->t('Cancel')); ?>" 
-		ng-click="feedBusinessLayer.renameFeedUnset(feed.id)"
+		ng-click="cancel(feed.id)"
 		class="action-button back-button action"></button>
 	  <button title="<?php p($l->t('Save')); ?>" 
 		ng-click="feedBusinessLayer.renameFeed(feed.id, feed.title)"
@@ -67,7 +67,8 @@
 
 		<button class="svg action rename-feed-icon"
 			ng-hide="feed.editing"
-			ng-click="feedBusinessLayer.renameFeedSet(feed.id)"
+			ng-controller="ItemController"
+			ng-click="edit(feed.id)"
 			title="<?php p($l->t('Rename feed')); ?>"
 			oc-tooltip></button>