ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1652 from ostcar/make_os-perms-lite_and_ng-show_compatible

Browse Source 
Fix os-perms-lite to make it compatible to ng-show and ng-hide
This commit is contained in:
Oskar Hahn 2015-10-21 21:25:29 +02:00
commit 17973bae3d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openslides/core/static/css/app.css
View File

@ -553,3 +553,8 @@ table.cke_dialog_contents textarea {
width: 50px !important; width: 50px !important;
} }
} }
/* Hide elements with os-perms-lite */
.os-perms-lite {
display: none !important;
}

6
openslides/users/static/js/users/users.js
View File

@ -310,15 +310,15 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
}]) }])
/* /*
* Like osPermsLite but does only hide the DOM-Elements * Like osPerms but does only hide the DOM-Elements
* *
* This is the Code from angular.js ngShow. * This is the Code from angular.js ngShow.
*/ */
.directive('osPermsLite', [ .directive('osPermsLite', [
'$animate', '$animate',
function($animate) { function($animate) {
var NG_HIDE_CLASS = 'ng-hide'; var NG_HIDE_CLASS = 'os-perms-lite';
var NG_HIDE_IN_PROGRESS_CLASS = 'ng-hide-animate'; var NG_HIDE_IN_PROGRESS_CLASS = 'os-perms-lite-animate';
return { return {
restrict: 'A', restrict: 'A',
multiElement: true, multiElement: true,