wbrawner/tasks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #190 from nextcloud/app-navigation-mobile-fix

Browse source 
Don't hide sidebar when creating new list, closes #175
This commit is contained in:
Raimund Schlüßler 2018-08-26 14:10:01 +02:00 committed by GitHub
commit aa07132c2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
js/app/controllers/listcontroller.js
View file

@ -60,13 +60,14 @@ angular.module('Tasks').controller('ListController', [
});
};
this._$scope.startCreate = function() {
this._$scope.startCreate = function(e) {
_$scope.status.addingList = true;
_$scope.nameError = false;
$('.hasTooltip').tooltip('hide');
_$timeout(function() {
$('#newList').focus();
}, 50);
e.stopPropagation();
};
this._$scope.create = function() {
@ -89,7 +90,7 @@ angular.module('Tasks').controller('ListController', [
_$scope.status.newListName = "";
};
this._$scope.startEdit = function(calendar) {
this._$scope.startEdit = function(e, calendar) {
_$scope.status.addingList = false;
_$scope.nameError = false;
$('.hasTooltip').tooltip('hide');
@ -98,15 +99,17 @@ angular.module('Tasks').controller('ListController', [
_$timeout(function() {
$('#list_' + calendar.uri + ' input.edit').focus();
}, 50);
e.stopPropagation();
};
this._$scope.showCalDAVUrl = function(calendar) {
this._$scope.showCalDAVUrl = function(e, calendar) {
_$scope.status.addingList = false;
_$scope.nameError = false;
$location.path('/calendars/' + _$scope.route.calendarID + '/edit/caldav');
_$timeout(function() {
$('#list_' + calendar.uri + ' input.caldav').focus();
}, 50);
e.stopPropagation();
};
this._$scope.hideCalDAVUrl = function() {

6
templates/main.php
View file

@ -45,13 +45,13 @@
<div class="app-navigation-entry-menu" ng-show="calendar.writable">
<ul>
<li>
<a ng-click="startEdit(calendar)">
<a ng-click="startEdit($event, calendar)">
<span class="icon-rename"></span>
<span><?php p($l->t('Edit')); ?></span>
</a>
</li>
<li>
<a ng-click="showCalDAVUrl(calendar)">
<a ng-click="showCalDAVUrl($event, calendar)">
<span class="icon-public"></span>
<span><?php p($l->t('Link')); ?></span>
</a>
@ -104,7 +104,7 @@
</li>
<li class="newList handler icon-add reactive editing" ng-class="{edit: status.addingList}">
<a class="addlist icon sprite"
ng-click="startCreate()"
ng-click="startCreate($event)"
oc-click-focus="{selector: '#newList', timeout: 0}">
<span class="title"><?php p($l->t('Add List...')); ?></span>
</a>