github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

only participate in track changes test if they are shown view

Browse source
This commit is contained in:
Henry Oswald 2015-11-10 15:14:27 +00:00
parent 5598624ee1
commit b6b252b1f8
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/web/app/views/project/editor/track-changes.jade
View file

@ -1,6 +1,6 @@
div#trackChanges(ng-show="ui.view == 'track-changes'") div#trackChanges(ng-show="ui.view == 'track-changes'")
span(sixpack-switch="track_changes_feature_info") span(ng-controller="TrackChangesPremiumPopup")
span(sixpack-default) span(ng-if="versioningPopupType == 'default'")
.upgrade-prompt(ng-show="!project.features.versioning") .upgrade-prompt(ng-show="!project.features.versioning")
.message(ng-show="project.owner._id == user.id") .message(ng-show="project.owner._id == user.id")
@ -16,7 +16,7 @@ div#trackChanges(ng-show="ui.view == 'track-changes'")
a.small(href, ng-click="toggleTrackChanges()") #{translate("cancel")} a.small(href, ng-click="toggleTrackChanges()") #{translate("cancel")}
p.small(ng-show="startedFreeTrial") #{translate("refresh_page_after_starting_free_trial")} p.small(ng-show="startedFreeTrial") #{translate("refresh_page_after_starting_free_trial")}
.upgrade-prompt(ng-show="!project.features.versioning", sixpack-when="longform") .upgrade-prompt(ng-show="!project.features.versioning", ng-if="versioningPopupType == 'longform'")
.message(ng-show="project.owner._id == user.id") .message(ng-show="project.owner._id == user.id")
p Upgrade to see your Entire Project History, plus: p Upgrade to see your Entire Project History, plus:

10
services/web/public/coffee/ide/track-changes/controllers/TrackChangesListController.coffee
View file

@ -1,6 +1,16 @@
define [ define [
"base" "base"
], (App) -> ], (App) ->
App.controller "TrackChangesPremiumPopup", ($scope, ide, sixpack)->
$scope.$watch "ui.view", ->
if $scope.ui.view == "track-changes"
if $scope.project?.features?.versioning
$scope.versioningPopupType = "default"
else if $scope.ui.view == "track-changes"
sixpack.participate 'track_changes_feature_info', ['default', 'longform'], (chosenVariation, rawResponse)->
$scope.versioningPopupType = chosenVariation
App.controller "TrackChangesListController", ["$scope", "ide", ($scope, ide) -> App.controller "TrackChangesListController", ["$scope", "ide", ($scope, ide) ->
$scope.hoveringOverListSelectors = false $scope.hoveringOverListSelectors = false