diff options
| -rw-r--r-- | apps/comments/js/commentstabview.js | 15 | ||||
| -rw-r--r-- | core/Controller/AutoCompleteController.php | 2 | ||||
| -rw-r--r-- | core/css/apps.scss | 22 | ||||
| -rw-r--r-- | core/css/styles.scss | 1 | ||||
| -rw-r--r-- | core/routes.php | 2 |
5 files changed, 32 insertions, 10 deletions
diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js index 9e501b141a7..20f1f590a28 100644 --- a/apps/comments/js/commentstabview.js +++ b/apps/comments/js/commentstabview.js @@ -240,19 +240,22 @@ if(!_.isUndefined(this._autoCompleteRequestCall)) { this._autoCompleteRequestCall.abort(); } - this._autoCompleteRequestCall = $.get( - OC.generateUrl('/autocomplete/get'), - { + this._autoCompleteRequestCall = $.ajax({ + url: OC.linkToOCS('core', 2) + 'autocomplete/get', + data: { search: query, itemType: 'files', itemId: s.model.get('id'), sorter: 'commenters|share-recipients', limit: OC.appConfig.comments.maxAutoCompleteResults }, - function (data) { - callback(data); + beforeSend: function (request) { + request.setRequestHeader('Accept', 'application/json'); + }, + success: function (result) { + callback(result.ocs.data); } - ); + }); }, 400); }, diff --git a/core/Controller/AutoCompleteController.php b/core/Controller/AutoCompleteController.php index 93ab9291322..3f3858ce1c8 100644 --- a/core/Controller/AutoCompleteController.php +++ b/core/Controller/AutoCompleteController.php @@ -23,7 +23,7 @@ namespace OC\Core\Controller; -use OCP\AppFramework\Controller; +use OCP\AppFramework\OCSController as Controller; use OCP\AppFramework\Http\DataResponse; use OCP\Collaboration\AutoComplete\IManager; use OCP\Collaboration\Collaborators\ISearch; diff --git a/core/css/apps.scss b/core/css/apps.scss index fc255aca676..6b3ab623704 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -152,7 +152,7 @@ kbd { &, > a { opacity: 1; - box-shadow: inset 2px 0 $color-primary; + box-shadow: inset 4px 0 $color-primary; } } @@ -177,7 +177,6 @@ kbd { /* Second level nesting for lists */ > ul { flex: 0 1 auto; - padding-left: 44px; width: 100%; transition: max-height 2000ms ease-in-out, opacity 250ms ease-in-out; @@ -187,6 +186,7 @@ kbd { > li { display: inline-flex; flex-wrap: wrap; + padding-left: 44px; &:focus, &:hover, &.active, @@ -197,10 +197,28 @@ kbd { } } + &.active { + box-shadow: inset 4px 0 $color-primary; + } + /* align loader */ &.icon-loading-small:after { left: 22px; /* 44px / 2 */ } + + > .app-navigation-entry-deleted { + /* margin to keep active indicator visible */ + margin-left: 4px; + padding-left: 84px; + } + + > .app-navigation-entry-edit { + /* margin to keep active indicator visible */ + margin-left: 4px; + /* align the input correctly with the link text + 44px+44px-4px-6px padding for the input */ + padding-left: 78px !important; + } } } } diff --git a/core/css/styles.scss b/core/css/styles.scss index 5a927046c03..af06504ccb3 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -183,6 +183,7 @@ body { font-size: 1.2em; padding: 3px; padding-left: 25px; + padding-right: 20px; background: transparent url('../img/actions/search-white.svg?v=1') no-repeat 6px center; color: $color-primary-text; border: 0; diff --git a/core/routes.php b/core/routes.php index 87c265d8098..1c7be78bc78 100644 --- a/core/routes.php +++ b/core/routes.php @@ -64,7 +64,6 @@ $application->registerRoutes($this, [ ['name' => 'Js#getJs', 'url' => '/js/{appName}/{fileName}', 'verb' => 'GET'], ['name' => 'contactsMenu#index', 'url' => '/contactsmenu/contacts', 'verb' => 'POST'], ['name' => 'contactsMenu#findOne', 'url' => '/contactsmenu/findOne', 'verb' => 'POST'], - ['name' => 'AutoComplete#get', 'url' => 'autocomplete/get', 'verb' => 'GET'], ['name' => 'WalledGarden#get', 'url' => '/204', 'verb' => 'GET'], ['name' => 'Search#search', 'url' => '/core/search', 'verb' => 'GET'], ], @@ -75,6 +74,7 @@ $application->registerRoutes($this, [ ['root' => '/identityproof', 'name' => 'OCS#getIdentityProof', 'url' => '/key/{cloudId}', 'verb' => 'GET'], ['root' => '/core', 'name' => 'Navigation#getAppsNavigation', 'url' => '/navigation/apps', 'verb' => 'GET'], ['root' => '/core', 'name' => 'Navigation#getSettingsNavigation', 'url' => '/navigation/settings', 'verb' => 'GET'], + ['root' => '/core', 'name' => 'AutoComplete#get', 'url' => '/autocomplete/get', 'verb' => 'GET'], ], ]); |