From c319be975102df8cf0b37977f8ab3ea1b241b99a Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Tue, 6 Dec 2016 16:48:20 +0300 Subject: [PATCH] firstname & lastname replaced by name --- .../csharp-mvc/Views/Home/Editor.aspx | 3 +- .../csharp/DocEditor.aspx | 3 +- .../java/src/main/webapp/editor.jsp | 3 +- web/documentserver-example/nodejs/app.js | 13 +++--- .../nodejs/helpers/docManager.js | 7 +-- .../nodejs/public/javascripts/jscript.js | 45 ++++++------------- .../nodejs/views/editor.ejs | 3 +- web/documentserver-example/php/doceditor.php | 2 +- .../ruby/app/views/home/editor.html.erb | 3 +- 9 files changed, 26 insertions(+), 56 deletions(-) diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx index 127d96f3..4f7aa253 100644 --- a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx +++ b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx @@ -112,8 +112,7 @@ user: { id: "<%= DocManagerHelper.CurUserHostAddress() %>", - firstname: 'John', - lastname: 'Smith', + name: "John Smith", }, embedded: { diff --git a/web/documentserver-example/csharp/DocEditor.aspx b/web/documentserver-example/csharp/DocEditor.aspx index 2eb8ad6b..c0c07a74 100644 --- a/web/documentserver-example/csharp/DocEditor.aspx +++ b/web/documentserver-example/csharp/DocEditor.aspx @@ -105,8 +105,7 @@ user: { id: "<%= _Default.CurUserHostAddress(null) %>", - firstname: "John", - lastname: "Smith", + name: "John Smith", }, embedded: { diff --git a/web/documentserver-example/java/src/main/webapp/editor.jsp b/web/documentserver-example/java/src/main/webapp/editor.jsp index cc0180f3..6bfbfd8f 100644 --- a/web/documentserver-example/java/src/main/webapp/editor.jsp +++ b/web/documentserver-example/java/src/main/webapp/editor.jsp @@ -106,8 +106,7 @@ user: { id: "<%= Model.CurUserHostAddress() %>", - firstname: "John", - lastname: "Smith", + name: "John Smith", }, embedded: { diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js index 10340688..1227d59e 100644 --- a/web/documentserver-example/nodejs/app.js +++ b/web/documentserver-example/nodejs/app.js @@ -155,10 +155,9 @@ app.post("/upload", function (req, res) { res.write("{ \"filename\": \"" + file.name + "\"}"); var userid = req.query.userid ? req.query.userid : "uid-1"; - var firstname = req.query.firstname ? req.query.firstname : "Jonn"; - var lastname = req.query.lastname ? req.query.lastname : "Smith"; + var name = req.query.name ? req.query.name : "Jonn Smith"; - docManager.saveFileData(file.name, userid, firstname + " " + lastname); + docManager.saveFileData(file.name, userid, name); } res.end(); }); @@ -402,11 +401,10 @@ app.get("/editor", function (req, res) { var diff = []; var lang = docManager.getLang(); var userid = req.query.userid ? req.query.userid : "uid-1"; - var firstname = req.query.firstname ? req.query.firstname : "Jonn"; - var lastname = req.query.lastname ? req.query.lastname : "Smith"; + var name = req.query.name ? req.query.name : "Jonn Smith"; if (fileExt != null) { - var fileName = docManager.createDemo((req.query.sample ? "sample." : "new.") + fileExt, userid, firstname + " " + lastname); + var fileName = docManager.createDemo((req.query.sample ? "sample." : "new.") + fileExt, userid, name); var redirectPath = docManager.getProtocol() + "://" + docManager.req.get("host") + "/editor?fileName=" + encodeURIComponent(fileName) + docManager.getCustomParams(); res.redirect(redirectPath); @@ -472,8 +470,7 @@ app.get("/editor", function (req, res) { curUserHostAddress: docManager.curUserHostAddress(), lang: lang, userid: userid, - firstname: firstname, - lastname: lastname, + name: name, fileChoiceUrl: fileChoiceUrl, plugins: plugins }, diff --git a/web/documentserver-example/nodejs/helpers/docManager.js b/web/documentserver-example/nodejs/helpers/docManager.js index 98f56c22..c2fbb264 100644 --- a/web/documentserver-example/nodejs/helpers/docManager.js +++ b/web/documentserver-example/nodejs/helpers/docManager.js @@ -82,11 +82,8 @@ docManager.getCustomParams = function () { var userid = docManager.req.query.userid; params += (userid ? "&userid=" + userid : ""); - var firstname = docManager.req.query.firstname; - params += (firstname ? "&firstname=" + firstname : ""); - - var lastname = docManager.req.query.lastname; - params += (lastname ? "&lastname=" + lastname : ""); + var name = docManager.req.query.name; + params += (name ? "&name=" + name : ""); var lang = docManager.req.query.lang; params += (lang ? "&lang=" + docManager.getLang() : ""); diff --git a/web/documentserver-example/nodejs/public/javascripts/jscript.js b/web/documentserver-example/nodejs/public/javascripts/jscript.js index ddc60a93..ddf31be2 100644 --- a/web/documentserver-example/nodejs/public/javascripts/jscript.js +++ b/web/documentserver-example/nodejs/public/javascripts/jscript.js @@ -25,14 +25,12 @@ var language; var userid; -var firstname; -var lastname; +var name; if (typeof jQuery != "undefined") { jq = jQuery.noConflict(); - firstname = getUrlVars()["firstname"]; - lastname = getUrlVars()["lastname"]; + name = getUrlVars()["name"]; userid = getUrlVars()["userid"]; language = getUrlVars()["lang"]; @@ -43,12 +41,8 @@ if (typeof jQuery != "undefined") { jq("#language").change(function() { - var user = jq('#user option:selected').text(); - var arUser = user.split(' '); - firstname = arUser[0]; - //alert(language); - lastname = arUser[1]; - window.location = "?lang=" + jq(this).val() + "&userid=" + userid + "&firstname=" + firstname + "&lastname=" + lastname; + var name = jq('#user option:selected').text(); + window.location = "?lang=" + jq(this).val() + "&userid=" + userid + "&name=" + name; }); @@ -57,29 +51,16 @@ if (typeof jQuery != "undefined") { else userid = jq("#user").val(); - if ("" != firstname && undefined != firstname) - firstname=getUrlVars()["firstname"]; - else{ - var user = jq('#user option:selected').text(); - var arUser = user.split(' '); - firstname = arUser[0]; + if ("" != name && undefined != name) { + name=getUrlVars()["name"]; } - if ("" != lastname && undefined != lastname) - lastname=getUrlVars()["lastname"]; - else{ - var user = jq('#user option:selected').text(); - var arUser = user.split(' '); - lastname = arUser[1]; + else { + name = jq('#user option:selected').text(); } jq("#user").change(function() { - var user = jq('#user option:selected').text(); - var arUser = user.split(' '); - firstname = arUser[0]; - lastname = arUser[1]; - -//var fn = jq('#user option:selected').attr('value-fn'); - window.location = "?lang=" + language + "&userid=" + jq(this).val() + "&firstname=" + arUser[0] + "&lastname=" + arUser[1]; + var name = jq('#user option:selected').text(); + window.location = "?lang=" + language + "&userid=" + jq(this).val() + "&name=" + name; }); jq(function () { @@ -217,7 +198,7 @@ if (typeof jQuery != "undefined") { jq(document).on("click", "#beginEdit:not(.disable)", function () { var fileId = encodeURIComponent(jq('#hiddenFileName').val()); - var url = UrlEditor + "?fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&firstname=" +firstname +"&lastname=" + lastname; + var url = UrlEditor + "?fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&name=" + name; window.open(url, "_blank"); jq('#hiddenFileName').val(""); jq.unblockUI(); @@ -226,7 +207,7 @@ if (typeof jQuery != "undefined") { jq(document).on("click", "#beginView:not(.disable)", function () { var fileId = encodeURIComponent(jq('#hiddenFileName').val()); - var url = UrlEditor + "?mode=view&fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&firstname=" +firstname +"&lastname=" + lastname; + var url = UrlEditor + "?mode=view&fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&name=" + name; window.open(url, "_blank"); jq('#hiddenFileName').val(""); jq.unblockUI(); @@ -235,7 +216,7 @@ if (typeof jQuery != "undefined") { jq(document).on("click", "#beginEmbedded:not(.disable)", function () { var fileId = encodeURIComponent(jq('#hiddenFileName').val()); - var url = UrlEditor + "?type=embedded&fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&firstname=" +firstname +"&lastname=" + lastname; + var url = UrlEditor + "?type=embedded&fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&name=" + name; jq("#mainProgress").addClass("embedded"); jq("#beginEmbedded").addClass("disable"); diff --git a/web/documentserver-example/nodejs/views/editor.ejs b/web/documentserver-example/nodejs/views/editor.ejs index 1a945c8a..c16181b5 100644 --- a/web/documentserver-example/nodejs/views/editor.ejs +++ b/web/documentserver-example/nodejs/views/editor.ejs @@ -122,8 +122,7 @@ callbackUrl: "<%- editor.callbackUrl %>", user: { id: "<%= editor.userid %>", - firstname: "<%= editor.firstname %>", - lastname: "<%= editor.lastname %>" + name: "<%= editor.name %>", }, embedded: { saveUrl: "<%= file.uri %>", diff --git a/web/documentserver-example/php/doceditor.php b/web/documentserver-example/php/doceditor.php index 6c90ea8f..8ab44c4c 100644 --- a/web/documentserver-example/php/doceditor.php +++ b/web/documentserver-example/php/doceditor.php @@ -153,7 +153,7 @@ } ?> - var user = [{id:"0","name":"Jonn Smith","firstname":"John","lastname":"Smith"}, {id:"1","name":"Mark Pottato","firstname":"Mark","lastname":"Pottato"}, {id:"2","name":"Hamish Mitchell","firstname":"Hamish","lastname":"Mitchell"}]["" || 0]; + var user = [{id:"0","name":"Jonn Smith"}, {id:"1","name":"Mark Pottato"}, {id:"2","name":"Hamish Mitchell"}]["" || 0]; docEditor = new DocsAPI.DocEditor("iframeEditor", { diff --git a/web/documentserver-example/ruby/app/views/home/editor.html.erb b/web/documentserver-example/ruby/app/views/home/editor.html.erb index 2640f3b5..9601eaa9 100644 --- a/web/documentserver-example/ruby/app/views/home/editor.html.erb +++ b/web/documentserver-example/ruby/app/views/home/editor.html.erb @@ -68,8 +68,7 @@ user: { id: "<%= @file.cur_user_host_address %>", - firstname: "John", - lastname: "Smith", + name: "John Smith", }, embedded: {