agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-14 22:23:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Readd feature flag handling.

Browse Source
This commit is contained in:
Paulo Reis
2017-07-07 10:38:13 +01:00
parent 7bf203c77f
commit 71e0a6935f
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/views/project/editor/review-panel.pug
+3 -2
View File
@@ -65,6 +65,7 @@
review-panel-toggle( review-panel-toggle(
ng-model="reviewPanel.trackChangesOnForEveryone" ng-model="reviewPanel.trackChangesOnForEveryone"
on-toggle="toggleTrackChangesForEveryone(isOn);" on-toggle="toggleTrackChangesForEveryone(isOn);"
disabled="!project.features.trackChanges"
) )
//- disabled="!project.features.trackChanges" //- disabled="!project.features.trackChanges"
//- on-disabled-click="openTrackChangesUpgradeModal" //- on-disabled-click="openTrackChangesUpgradeModal"
@@ -76,7 +77,7 @@
review-panel-toggle( review-panel-toggle(
ng-model="reviewPanel.trackChangesState[project.owner._id].value" ng-model="reviewPanel.trackChangesState[project.owner._id].value"
on-toggle="toggleTrackChangesForUser(isOn, project.owner._id);" on-toggle="toggleTrackChangesForUser(isOn, project.owner._id);"
disabled="reviewPanel.trackChangesOnForEveryone" disabled="reviewPanel.trackChangesOnForEveryone || !project.features.trackChanges"
) )
li.rp-tc-state-item(ng-repeat="member in project.members") li.rp-tc-state-item(ng-repeat="member in project.members")
span.rp-tc-state-item-name( span.rp-tc-state-item-name(
@@ -86,7 +87,7 @@
review-panel-toggle( review-panel-toggle(
ng-model="reviewPanel.trackChangesState[member._id].value" ng-model="reviewPanel.trackChangesState[member._id].value"
on-toggle="toggleTrackChangesForUser(isOn, member._id);" on-toggle="toggleTrackChangesForUser(isOn, member._id);"
disabled="reviewPanel.trackChangesOnForEveryone" disabled="reviewPanel.trackChangesOnForEveryone || !project.features.trackChanges"
) )
//- span.review-panel-toolbar-label(ng-if="permissions.write") //- span.review-panel-toolbar-label(ng-if="permissions.write")
services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
+4 -1
View File
@@ -576,7 +576,10 @@ define [
ide.editorManager.openDocId(doc_id, { gotoOffset: entry.offset }) ide.editorManager.openDocId(doc_id, { gotoOffset: entry.offset })
$scope.toggleFullTCStateCollapse = () -> $scope.toggleFullTCStateCollapse = () ->
reviewPanel.fullTCStateCollapsed = !reviewPanel.fullTCStateCollapsed if $scope.project.features.trackChanges
reviewPanel.fullTCStateCollapsed = !reviewPanel.fullTCStateCollapsed
else
$scope.openTrackChangesUpgradeModal()
_setUserTCState = (userId, newValue, isLocal = false) -> _setUserTCState = (userId, newValue, isLocal = false) ->
$scope.reviewPanel.trackChangesState[userId] ?= {} $scope.reviewPanel.trackChangesState[userId] ?= {}
services/web/public/coffee/ide/review-panel/directives/reviewPanelToggle.coffee
+2 -2
View File
@@ -8,14 +8,14 @@ define [
ngModel: '=' ngModel: '='
valWhenUndefined: '=?' valWhenUndefined: '=?'
disabled: '=?' disabled: '=?'
onDisabledClick: '=?' onDisabledClick: '&?'
link: (scope) -> link: (scope) ->
if !scope.disabled? if !scope.disabled?
scope.disabled = false scope.disabled = false
scope.onChange = (args...) -> scope.onChange = (args...) ->
scope.onToggle({ isOn: scope.localModel }) scope.onToggle({ isOn: scope.localModel })
scope.handleClick = () -> scope.handleClick = () ->
if scope.disabled if scope.disabled and scope.onDisabledClick?
scope.onDisabledClick() scope.onDisabledClick()
scope.localModel = scope.ngModel scope.localModel = scope.ngModel
scope.$watch "ngModel", (value) -> scope.$watch "ngModel", (value) ->