Commit 10e65d85 authored by Ujvari Gergely's avatar Ujvari Gergely Committed by Randall Leeds

Add angular animate library and real-time update new annotations

* angular-animate.js library was added to the project (as a file, and to assests.py and app.coffee)
* The ng-repeater tags for annotations in both viewer.html and page_search.html were enhanced with the vl-animate class
* This vl-animate css class contains the animation description in the common.scss (currently emulating a 3D cube change)
* The update notification bar is no longer active.
parent 9ebb9662
...@@ -719,10 +719,6 @@ blockquote { ...@@ -719,10 +719,6 @@ blockquote {
padding: 0; padding: 0;
padding-left: $thread-padding; padding-left: $thread-padding;
&:first-child {
margin-top: .5em;
}
&.collapsed { &.collapsed {
& > .annotation { & > .annotation {
fuzzytime { fuzzytime {
...@@ -801,26 +797,30 @@ blockquote { ...@@ -801,26 +797,30 @@ blockquote {
background-image: url("../images/plus_1.png"); background-image: url("../images/plus_1.png");
} }
} }
}
&.collapse-hide-setup > ul {
@include transition-timing-function(cubic-bezier(0, 1, 0, 1));
max-height: 65536px;
overflow: hidden;
}
&.collapse-hide-start > ul { .thread.ng-enter,
max-height: 0; .thread.ng-leave,
} .thread.ng-move {
@include transition-duration(.25s);
@include transition-property(max-height);
overflow: hidden;
&.collapse-show-setup > ul { .threadexp { display: none; }
@include transition-timing-function(cubic-bezier(1, 0, 1, 0)); }
max-height: 0;
overflow: hidden;
}
&.collapse-show-start > ul { .thread.ng-leave.ng-leave-active,
max-height: 65536px; .thread.ng-enter {
} @include transition-timing-function(cubic-bezier(0, 1, 0, 1));
max-height: 0;
}
.thread.ng-enter.ng-enter-active,
.thread.ng-leave {
@include transition-duration(.1s);
@include transition-timing-function(cubic-bezier(1, 0, 1, 0));
max-height: 65536px;
} }
...@@ -1211,25 +1211,6 @@ h3.stream { ...@@ -1211,25 +1211,6 @@ h3.stream {
cursor: pointer; cursor: pointer;
} }
.fadeIn-setup,.fadeOut-setup {
-webkit-transition: .25s linear opacity;
-moz-transition: .25s linear opacity;
-o-transition: .25s linear opacity;
transition: .25s linear opacity;
}
.fadeIn-setup{
opacity:0;
}
.fadeOut-setup{
opacity:1;
}
.fadeIn-setup.fadeIn-start {
opacity: 1;
}
.fadeOut-setup.fadeOut-start{
opacity:0;
}
// View and Sort tabs //////////////////// // View and Sort tabs ////////////////////
...@@ -1252,4 +1233,4 @@ h3.stream { ...@@ -1252,4 +1233,4 @@ h3.stream {
margin: 0 3px; margin: 0 3px;
display: inline-block; display: inline-block;
z-index: 4; z-index: 4;
} }
\ No newline at end of file
imports = [ imports = [
'bootstrap' 'bootstrap'
'ngAnimate'
'ngRoute' 'ngRoute'
'h.controllers' 'h.controllers'
'h.directives' 'h.directives'
......
...@@ -425,15 +425,14 @@ class App ...@@ -425,15 +425,14 @@ class App
unless data instanceof Array then data = [data] unless data instanceof Array then data = [data]
$scope.$apply => $scope.$apply =>
if $scope.socialView.name is 'single-player' if $scope.socialView.name is 'single-player'
for d in data owndata = data.filter (d) -> d.user is user
if d.user is user if action is 'create'
$scope.addUpdateNotification() if annotator.plugins.Store?
$scope.new_updates += 1 annotator.plugins.Store._onLoadAnnotations owndata
break
else else
if data.length > 0 if action is 'create'
$scope.addUpdateNotification() if annotator.plugins.Store?
$scope.new_updates += 1 annotator.plugins.Store._onLoadAnnotations data
$timeout => $timeout =>
$scope.initUpdater() $scope.initUpdater()
...@@ -605,6 +604,7 @@ class Annotation ...@@ -605,6 +604,7 @@ class Annotation
return if $element.find('.share-dialog').is ":visible" return if $element.find('.share-dialog').is ":visible"
$scope.shared = not $scope.shared $scope.shared = not $scope.shared
$scope.toggle() $scope.toggle()
return
$scope.rebuildHighlightText = -> $scope.rebuildHighlightText = ->
if annotator.text_regexp? if annotator.text_regexp?
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment