diff options
| -rw-r--r-- | js/app/services/bl/folderbl.coffee | 4 | ||||
| -rw-r--r-- | js/public/app.js | 4 | ||||
| -rw-r--r-- | js/tests/services/bl/folderblSpec.coffee | 8 | ||||
| -rw-r--r-- | templates/part.listfolder.php | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/js/app/services/bl/folderbl.coffee b/js/app/services/bl/folderbl.coffee index d9b2b2cff..6085ca50e 100644 --- a/js/app/services/bl/folderbl.coffee +++ b/js/app/services/bl/folderbl.coffee @@ -47,8 +47,8 @@ ItemModel, ShowAll)-> folder = @_folderModel.getById(folderId) if angular.isDefined(folder) - folder.open = !folder.open - if folder.open + folder.opened = !folder.opened + if folder.opened @_persistence.openFolder(folder.id) else @_persistence.collapseFolder(folder.id) diff --git a/js/public/app.js b/js/public/app.js index c567e8fee..9c340462f 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -720,8 +720,8 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. var folder; folder = this._folderModel.getById(folderId); if (angular.isDefined(folder)) { - folder.open = !folder.open; - if (folder.open) { + folder.opened = !folder.opened; + if (folder.opened) { return this._persistence.openFolder(folder.id); } else { return this._persistence.collapseFolder(folder.id); diff --git a/js/tests/services/bl/folderblSpec.coffee b/js/tests/services/bl/folderblSpec.coffee index 5c36cf203..251ceeb36 100644 --- a/js/tests/services/bl/folderblSpec.coffee +++ b/js/tests/services/bl/folderblSpec.coffee @@ -56,16 +56,16 @@ describe 'FolderBl', -> @persistence.openFolder = jasmine.createSpy('open') @persistence.collapseFolder = jasmine.createSpy('collapse') - @FolderModel.add({id: 3, open: false}) + @FolderModel.add({id: 3, opened: false}) @FolderBl.toggleFolder(4) - expect(@FolderModel.getById(3).open).toBeFalsy() + expect(@FolderModel.getById(3).opened).toBeFalsy() @FolderBl.toggleFolder(3) - expect(@FolderModel.getById(3).open).toBeTruthy() + expect(@FolderModel.getById(3).opened).toBeTruthy() expect(@persistence.openFolder).toHaveBeenCalledWith(3) @FolderBl.toggleFolder(3) - expect(@FolderModel.getById(3).open).toBeFalsy() + expect(@FolderModel.getById(3).opened).toBeFalsy() expect(@persistence.collapseFolder).toHaveBeenCalledWith(3) diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php index 897cea41b..e932babb8 100644 --- a/templates/part.listfolder.php +++ b/templates/part.listfolder.php @@ -1,13 +1,13 @@ <li ng-class="{ active: folderBl.isActive(folder.id), - open: folder.open, + open: folder.opened, collapsible: folderBl.hasFeeds(folder.id), unread: folderBl.getUnreadCount(folder.id) != 0 }" ng-repeat="folder in folderBl.getAll()" ng-show="folderBl.isVisible(folder.id)" class="folder" - data-id="{{folder.id}}" + data-id="{{ folder.id }}" droppable> <button class="collapse" title="<?php p($l->t('Collapse'));?>" @@ -15,7 +15,7 @@ <a href="#" class="title folder-icon" ng-click="folderBl.load(folder.id)"> - {{folder.name}} + {{ folder.name }} </a> <span class="utils"> |