From 196aafd9d6d72ea09701a1b5b3fce33dc889410a Mon Sep 17 00:00:00 2001 From: Mike Brousseau Date: Wed, 21 Nov 2012 13:35:47 -0500 Subject: [PATCH 1/5] Update src/static/js/pad.js Gramatically change. Changed "You're Password" to "Your Password". --- src/static/js/pad.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/static/js/pad.js b/src/static/js/pad.js index b665c2fbd..34f2a2877 100644 --- a/src/static/js/pad.js +++ b/src/static/js/pad.js @@ -310,7 +310,7 @@ function handshake() } else if(obj.accessStatus == "wrongPassword") { - $("#editorloadingbox").html("You're password was wrong
" + + $("#editorloadingbox").html("Your password was wrong
" + ""+ ""); } From 28cd6e64b3a1494cdbaef44e936f4e458d7bfa92 Mon Sep 17 00:00:00 2001 From: johnyma22 Date: Wed, 21 Nov 2012 20:09:31 +0000 Subject: [PATCH 2/5] make runner CSS more sane --- tests/frontend/runner.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/frontend/runner.css b/tests/frontend/runner.css index 0e4b5fd13..7d5bb7838 100644 --- a/tests/frontend/runner.css +++ b/tests/frontend/runner.css @@ -15,12 +15,15 @@ body { #iframe-container { width: 50%; height: 100%; - float:right; } #iframe-container iframe { - width: 100%; height: 100%; + position:absolute; + min-width:500px; + max-width:800px; + left:50%; + width:100%; } #mocha { From aebf6ee1e8688d4efd8a6a06fb15cad824cac62c Mon Sep 17 00:00:00 2001 From: johnyma22 Date: Wed, 21 Nov 2012 22:22:01 +0000 Subject: [PATCH 3/5] language test should pass int ravis now --- tests/frontend/specs/language.js | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/tests/frontend/specs/language.js b/tests/frontend/specs/language.js index 87d04220c..7d294282c 100644 --- a/tests/frontend/specs/language.js +++ b/tests/frontend/specs/language.js @@ -1,10 +1,19 @@ +function deletecookie(name) { + document.cookie = name + '=; expires=Thu, 01 Jan 1970 00:00:01 GMT;'; +} + describe("Language select and change", function(){ + // Destroy language cookies + deletecookie("language", null); + //create a new pad before each test run beforeEach(function(cb){ helper.newPad(cb); this.timeout(60000); }); + // Destroy language cookies + it("makes text german", function(done) { var inner$ = helper.padInner$; var chrome$ = helper.padChrome$; @@ -21,14 +30,16 @@ describe("Language select and change", function(){ $languageoption.attr('selected','selected'); $language.change(); - helper.waitFor(function() { return $language.val() == "de"}) + helper.waitFor(function() { + return chrome$(".buttonicon-bold").parent()[0]["title"] = "Fett (Strg-B)"; + }) .done(function(){ //get the value of the bold button var $boldButton = chrome$(".buttonicon-bold").parent(); //get the title of the bold button var boldButtonTitle = $boldButton[0]["title"]; - + //check if the language is now german expect(boldButtonTitle).to.be("Fett (Strg-B)"); done(); @@ -51,7 +62,10 @@ describe("Language select and change", function(){ $languageoption.attr('selected','selected'); $language.change(); - helper.waitFor(function() { return $language.val() == "en";}) + //get the value of the bold button + var $boldButton = chrome$(".buttonicon-bold").parent(); + + helper.waitFor(function() { return $boldButton[0]["title"] != "Fett (Strg-B)";}) .done(function(){ //get the value of the bold button @@ -67,4 +81,4 @@ describe("Language select and change", function(){ }); }); -}); \ No newline at end of file +}); From d6027726e687b04ee23b2c5b5475e2b0d9b15ff5 Mon Sep 17 00:00:00 2001 From: Hyacinthe Cartiaux Date: Thu, 22 Nov 2012 01:12:30 +0100 Subject: [PATCH 4/5] Fix urls, use github.com/ether Signed-off-by: Hyacinthe Cartiaux --- bin/loadTesting/README | 2 +- doc/api/http_api.md | 2 +- src/node/hooks/express.js | 2 +- src/package.json | 2 +- src/static/js/AttributePool.js | 2 +- src/static/js/ace2_inner.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/loadTesting/README b/bin/loadTesting/README index 297756f9d..6a7786644 100644 --- a/bin/loadTesting/README +++ b/bin/loadTesting/README @@ -3,7 +3,7 @@ This load tester is extremely useful for testing how many dormant clients can co TODO: Emulate characters being typed into a pad -HOW TO USE (from @mjd75) proper formatting at: https://github.com/Pita/etherpad-lite/issues/360 +HOW TO USE (from @mjd75) proper formatting at: https://github.com/ether/etherpad-lite/issues/360 Server 1: Installed Node.js (etc), EtherPad Lite and MySQL diff --git a/doc/api/http_api.md b/doc/api/http_api.md index 990d1b498..7ace1b0b7 100644 --- a/doc/api/http_api.md +++ b/doc/api/http_api.md @@ -9,7 +9,7 @@ The API gives another web application control of the pads. The basic functions a The API is designed in a way, so you can reuse your existing user system with their permissions, and map it to etherpad lite. Means: Your web application still has to do authentication, but you can tell etherpad lite via the api, which visitors should get which permissions. This allows etherpad lite to fit into any web application and extend it with real-time functionality. You can embed the pads via an iframe into your website. -Take a look at [HTTP API client libraries](https://github.com/Pita/etherpad-lite/wiki/HTTP-API-client-libraries) to see if a library in your favorite language. +Take a look at [HTTP API client libraries](https://github.com/ether/etherpad-lite/wiki/HTTP-API-client-libraries) to see if a library in your favorite language. ## Examples diff --git a/src/node/hooks/express.js b/src/node/hooks/express.js index eb3f6188a..1900a86a8 100644 --- a/src/node/hooks/express.js +++ b/src/node/hooks/express.js @@ -26,7 +26,7 @@ exports.createServer = function () { { console.warn("Can't get git version for server header\n" + e.message) } - console.log("Report bugs at https://github.com/Pita/etherpad-lite/issues") + console.log("Report bugs at https://github.com/ether/etherpad-lite/issues") serverName = "Etherpad-Lite " + version + " (http://j.mp/ep-lite)"; diff --git a/src/package.json b/src/package.json index 9fd180abd..00dc0f1f6 100644 --- a/src/package.json +++ b/src/package.json @@ -1,7 +1,7 @@ { "name" : "ep_etherpad-lite", "description" : "A Etherpad based on node.js", - "homepage" : "https://github.com/Pita/etherpad-lite", + "homepage" : "https://github.com/ether/etherpad-lite", "keywords" : ["etherpad", "realtime", "collaborative", "editor"], "author" : "Peter 'Pita' Martischka - Primary Technology Ltd", "contributors" : [ diff --git a/src/static/js/AttributePool.js b/src/static/js/AttributePool.js index f5990c07d..96ea9b0da 100644 --- a/src/static/js/AttributePool.js +++ b/src/static/js/AttributePool.js @@ -3,7 +3,7 @@ * 90% of the code is still like in the original Etherpad * Look at https://github.com/ether/pad/blob/master/infrastructure/ace/www/easysync2.js * You can find a explanation what a attribute pool is here: - * https://github.com/Pita/etherpad-lite/blob/master/doc/easysync/easysync-notes.txt + * https://github.com/ether/etherpad-lite/blob/master/doc/easysync/easysync-notes.txt */ /* diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index 2e56b950f..661ea0119 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -3266,7 +3266,7 @@ function Ace2Inner(){ } } //hide the dropdownso - if(window.parent.parent.padeditbar){ // required in case its in an iframe should probably use parent.. See Issue 327 https://github.com/Pita/etherpad-lite/issues/327 + if(window.parent.parent.padeditbar){ // required in case its in an iframe should probably use parent.. See Issue 327 https://github.com/ether/etherpad-lite/issues/327 window.parent.parent.padeditbar.toggleDropDown("none"); } } From 8ac49477f9095574e680769eea95a9925cab5d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Eixarch?= Date: Sat, 24 Nov 2012 00:42:44 +0100 Subject: [PATCH 5/5] Fix 1203: non-escaped html in plugins info --- src/templates/admin/plugins-info.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/templates/admin/plugins-info.html b/src/templates/admin/plugins-info.html index 22f87073e..6b02c3275 100644 --- a/src/templates/admin/plugins-info.html +++ b/src/templates/admin/plugins-info.html @@ -21,10 +21,10 @@

Installed hooks

Server side hooks

-
<%= plugins.formatHooks() %>
+
<%- plugins.formatHooks() %>

Client side hooks

-
<%= plugins.formatHooks("client_hooks") %>
+
<%- plugins.formatHooks("client_hooks") %>