diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2013-09-23 01:51:17 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2013-09-23 01:51:31 +0200 |
commit | d8eb445220de1b6a71ce77468b6aedec3e547697 (patch) | |
tree | ca9ecdf9d95f675a95e80e87426a0f4d6c5f8f29 | |
parent | 3fff80e49481bc341bddca07765a5cc01b6406ad (diff) |
add form shouldn’t be blocked while adding a feed
Edit
-rw-r--r-- | CHANGELOG | 3 | ||||
-rw-r--r-- | templates/part.addnew.php | 8 |
2 files changed, 5 insertions, 6 deletions
@@ -1,3 +1,6 @@ +owncloud-news (1.605) +* Adding feeds does not block the input box any more + owncloud-news (1.604) * Use 64bit integers to prevent running out of ids after a year for large installations * Fix postgres feed queries with correct group by diff --git a/templates/part.addnew.php b/templates/part.addnew.php index 10511c95d..067db1d26 100644 --- a/templates/part.addnew.php +++ b/templates/part.addnew.php @@ -29,12 +29,11 @@ <input type="text" ng-model="feedUrl" placeholder="<?php p($l->t('Address')); ?>" - ng-disabled="isAddingFeed() || isAddingFolder()" name="adress" autofocus> <button title="<?php p($l->t('Add')); ?>" class="primary" - ng-disabled="isAddingFeed() || isAddingFolder() || !feedUrl.trim()" + ng-disabled="!feedUrl.trim()" ng-click="addFeed(feedUrl, folderId.id)"><?php p($l->t('Add')); ?></button> </form> <form> @@ -42,7 +41,6 @@ data-create="<?php p($l->t('New folder')); ?>" title="<?php p($l->t('Folder')); ?>" ng-model="folderId" - ng-disabled="isAddingFolder()" ng-options="folder.name for folder in folderBusinessLayer.getAll()" ng-hide="addNewFolder"> <option value="" selected="selected"><?php p($l->t('Choose folder')); ?></option> @@ -54,7 +52,6 @@ oc-click-focus="{selector: 'input[name=\'foldername\']'}"></button> <input type="text" ng-model="folderName" - ng-disabled="isAddingFolder()" ng-show="addNewFolder" name="foldername" placeholder="<?php p($l->t('Folder name')); ?>" @@ -63,12 +60,11 @@ <button title="<?php p($l->t('Back to folder selection')); ?>" ng-show="addNewFolder" ng-click="addNewFolder=false" - ng-disabled="isAddingFolder()" class="action-button back-button action"></button> <button title="<?php p($l->t('Create folder')); ?>" ng-show="addNewFolder" ng-click="addFolder(folderName)" - ng-disabled="isAddingFolder() || !folderName.trim()" + ng-disabled="!folderName.trim()" ng-class="{loading: isAddingFolder()}" class="action-button create-button action"> </button> |