fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix timeslider stars and frontend tests, needs css polish

This commit is contained in:
John McLear 2015-01-01 22:40:45 +00:00
parent be4782ae07
commit 230302b132
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/static/css/timeslider.css
View File

@ -154,11 +154,17 @@ stepper:active{
top: 20px; top: 20px;
width: 25px; width: 25px;
} }
.star:before{
font-family: fontawesome-etherpad;
content: "\e835";
vertical-align:middle;
font-size:16px;
}
#timeslider .star { #timeslider .star {
cursor: pointer; cursor: pointer;
height: 16px; height: 16px;
position: absolute; position: absolute;
top: 40px; top: 25px;
width: 15px; width: 15px;
} }
#timeslider #timer { #timeslider #timer {

3
tests/frontend/specs/timeslider_revisions.js
View File

@ -19,6 +19,7 @@ describe("timeslider", function(){
inner$("div").first().sendkeys('a'); inner$("div").first().sendkeys('a');
}, timePerRev*i); }, timePerRev*i);
} }
chrome$('.buttonicon-savedRevision').click();
setTimeout(function() { setTimeout(function() {
// go to timeslider // go to timeslider
@ -51,6 +52,8 @@ describe("timeslider", function(){
setTimeout(function() { setTimeout(function() {
//make sure the text has changed //make sure the text has changed
expect( timeslider$('#padcontent').text() ).not.to.eql( latestContents ); expect( timeslider$('#padcontent').text() ).not.to.eql( latestContents );
var starIsVisible = timeslider$('.star').is(":visible");
expect( starIsVisible ).to.eql( true );
done(); done();
}, 1000); }, 1000);