mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert displayName casing 

Regression from 278c281cc9

Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Joas Schilling 2019-05-10 14:09:08 +02:00 committed by Roeland Jago Douma
parent 9d66e91f0b
commit fc1987b8c4
No known key found for this signature in database
GPG Key ID: F941078878347C0C
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/js/dist/login.js vendored
View File

@ -137,7 +137,7 @@ function ee(e){for(var t,n=[],a=0,r=-1,i=0;a<e.length;){t=e.charAt(a);var s=!i&&
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/if(void 0===ae){var re=(ae=location.pathname).indexOf("/index.php/");ae=-1!==re?ae.substr(0,re):ae.substr(0,ae.lastIndexOf("/"))}var ie,se=ae,oe=a.a={coreApps:S.i,menuSpeed:S.j,PERMISSION_ALL:S.a,PERMISSION_CREATE:S.b,PERMISSION_DELETE:S.c,PERMISSION_NONE:S.d,PERMISSION_READ:S.e,PERMISSION_SHARE:S.f,PERMISSION_UPDATE:S.g,TAG_FAVORITE:S.h,addScript:function(e,t,n){var a;console.warn("OC.addScript is deprecated, use OCP.Loader.loadScript instead");var r=OC.filePath(e,"js",t+".js");return o[r]?n&&n():(a=s.a.Deferred(),s.a.getScript(r,function(){return a.resolve()}),o[r]=a),o[r]},addStyle:function(e,t){console.warn("OC.addStyle is deprecated, use OCP.Loader.loadStylesheet instead");var n=OC.filePath(e,"css",t+".css");-1===d.indexOf(n)&&(d.push(n),document.createStyleSheet?document.createStyleSheet(n):(t=s()('<link rel="stylesheet" type="text/css" href="'+n+'"/>'),s()("head").append(t)))},Apps:u.a,AppConfig:_,appConfig:c,appswebroots:m,Backbone:b,ContactsMenu:H.a,config:x,currentUser:A,dialogs:C,EventSource:W,getCurrentUser:function(){return{uid:A,displayname:P}},isUserAdmin:function(){return I},L10N:U,hideMenus:z,registerMenu:function(e,t,n,a){t.addClass("menu"),e.on("A"===e.prop("tagName")?"click.menu":"click.menu keyup.menu",function(r){r.preventDefault(),r.key&&"Enter"!==r.key||(t.is(N)?z():(N&&z(),!0===a&&t.parent().addClass("openedMenu"),e.attr("aria-expanded",!0),t.slideToggle(S.j,n),N=t,e))})},showMenu:function(e,t,n){t.is(N)||(z(),N=t,e,t.trigger(new s.a.Event("beforeShow")),t.show(),t.trigger(new s.a.Event("afterShow")),y.a.isFunction(n)&&n())},unregisterMenu:function(e,t){t.is(N)&&z(),e.off("click.menu").removeClass("menutoggle"),t.removeClass("menu")},msg:B,Notification:V,PasswordConfirmation:G.a,Plugins:{_plugins:{},register:function(e,t){var n=this._plugins[e];n||(n=this._plugins[e]=[]),n.push(t)},getPlugins:function(e){return this._plugins[e]||[]},attach:function(e,t,n){for(var a=this.getPlugins(e),r=0;r<a.length;r++)a[r].attach&&a[r].attach(t,n)},detach:function(e,t,n){for(var a=this.getPlugins(e),r=0;r<a.length;r++)a[r].detach&&a[r].detach(t,n)}},search:X,Util:te,debug:ne,generateUrl:q.b,get:(ie=window,function(e){for(var t=e.split("."),n=t.pop(),a=0;a<t.length;a++)if(!(ie=ie[t[a]]))return!1;return ie[n]}),set:function(e){return function(t,n){for(var a=t.split("."),r=a.pop(),i=0;i<a.length;i++)e[a[i]]||(e[a[i]]={}),e=e[a[i]];e[r]=n}}(window),getRootPath:q.c,filePath:q.a,redirect:function(e){return window.location=e},reload:function(){return window.location.reload()},linkTo:q.d,linkToOCS:q.e,linkToRemote:q.f,linkToRemoteBase:q.g,webroot:se};
*/if(void 0===ae){var re=(ae=location.pathname).indexOf("/index.php/");ae=-1!==re?ae.substr(0,re):ae.substr(0,ae.lastIndexOf("/"))}var ie,se=ae,oe=a.a={coreApps:S.i,menuSpeed:S.j,PERMISSION_ALL:S.a,PERMISSION_CREATE:S.b,PERMISSION_DELETE:S.c,PERMISSION_NONE:S.d,PERMISSION_READ:S.e,PERMISSION_SHARE:S.f,PERMISSION_UPDATE:S.g,TAG_FAVORITE:S.h,addScript:function(e,t,n){var a;console.warn("OC.addScript is deprecated, use OCP.Loader.loadScript instead");var r=OC.filePath(e,"js",t+".js");return o[r]?n&&n():(a=s.a.Deferred(),s.a.getScript(r,function(){return a.resolve()}),o[r]=a),o[r]},addStyle:function(e,t){console.warn("OC.addStyle is deprecated, use OCP.Loader.loadStylesheet instead");var n=OC.filePath(e,"css",t+".css");-1===d.indexOf(n)&&(d.push(n),document.createStyleSheet?document.createStyleSheet(n):(t=s()('<link rel="stylesheet" type="text/css" href="'+n+'"/>'),s()("head").append(t)))},Apps:u.a,AppConfig:_,appConfig:c,appswebroots:m,Backbone:b,ContactsMenu:H.a,config:x,currentUser:A,dialogs:C,EventSource:W,getCurrentUser:function(){return{uid:A,displayName:P}},isUserAdmin:function(){return I},L10N:U,hideMenus:z,registerMenu:function(e,t,n,a){t.addClass("menu"),e.on("A"===e.prop("tagName")?"click.menu":"click.menu keyup.menu",function(r){r.preventDefault(),r.key&&"Enter"!==r.key||(t.is(N)?z():(N&&z(),!0===a&&t.parent().addClass("openedMenu"),e.attr("aria-expanded",!0),t.slideToggle(S.j,n),N=t,e))})},showMenu:function(e,t,n){t.is(N)||(z(),N=t,e,t.trigger(new s.a.Event("beforeShow")),t.show(),t.trigger(new s.a.Event("afterShow")),y.a.isFunction(n)&&n())},unregisterMenu:function(e,t){t.is(N)&&z(),e.off("click.menu").removeClass("menutoggle"),t.removeClass("menu")},msg:B,Notification:V,PasswordConfirmation:G.a,Plugins:{_plugins:{},register:function(e,t){var n=this._plugins[e];n||(n=this._plugins[e]=[]),n.push(t)},getPlugins:function(e){return this._plugins[e]||[]},attach:function(e,t,n){for(var a=this.getPlugins(e),r=0;r<a.length;r++)a[r].attach&&a[r].attach(t,n)},detach:function(e,t,n){for(var a=this.getPlugins(e),r=0;r<a.length;r++)a[r].detach&&a[r].detach(t,n)}},search:X,Util:te,debug:ne,generateUrl:q.b,get:(ie=window,function(e){for(var t=e.split("."),n=t.pop(),a=0;a<t.length;a++)if(!(ie=ie[t[a]]))return!1;return ie[n]}),set:function(e){return function(t,n){for(var a=t.split("."),r=a.pop(),i=0;i<a.length;i++)e[a[i]]||(e[a[i]]={}),e=e[a[i]];e[r]=n}}(window),getRootPath:q.c,filePath:q.a,redirect:function(e){return window.location=e},reload:function(){return window.location.reload()},linkTo:q.d,linkToOCS:q.e,linkToRemote:q.f,linkToRemoteBase:q.g,webroot:se};
/*
* @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
*

2
core/js/dist/login.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/main.js vendored
View File

@ -137,7 +137,7 @@ function ee(e){for(var t,n=[],i=0,r=-1,s=0;i<e.length;){t=e.charAt(i);var o=!s&&
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/if(void 0===ie){var re=(ie=location.pathname).indexOf("/index.php/");ie=-1!==re?ie.substr(0,re):ie.substr(0,ie.lastIndexOf("/"))}var se,oe=ie,ae=i.a={coreApps:Y.i,menuSpeed:Y.j,PERMISSION_ALL:Y.a,PERMISSION_CREATE:Y.b,PERMISSION_DELETE:Y.c,PERMISSION_NONE:Y.d,PERMISSION_READ:Y.e,PERMISSION_SHARE:Y.f,PERMISSION_UPDATE:Y.g,TAG_FAVORITE:Y.h,addScript:function(e,t,n){var i;console.warn("OC.addScript is deprecated, use OCP.Loader.loadScript instead");var r=OC.filePath(e,"js",t+".js");return a[r]?n&&n():(i=o.a.Deferred(),o.a.getScript(r,function(){return i.resolve()}),a[r]=i),a[r]},addStyle:function(e,t){console.warn("OC.addStyle is deprecated, use OCP.Loader.loadStylesheet instead");var n=OC.filePath(e,"css",t+".css");-1===l.indexOf(n)&&(l.push(n),document.createStyleSheet?document.createStyleSheet(n):(t=o()('<link rel="stylesheet" type="text/css" href="'+n+'"/>'),o()("head").append(t)))},Apps:c.a,AppConfig:h,appConfig:d,appswebroots:p,Backbone:D,ContactsMenu:S.a,config:T,currentUser:H,dialogs:I,EventSource:z,getCurrentUser:function(){return{uid:H,displayname:E}},isUserAdmin:function(){return B},L10N:Q,hideMenus:N,registerMenu:function(e,t,n,i){t.addClass("menu"),e.on("A"===e.prop("tagName")?"click.menu":"click.menu keyup.menu",function(r){r.preventDefault(),r.key&&"Enter"!==r.key||(t.is(F)?N():(F&&N(),!0===i&&t.parent().addClass("openedMenu"),e.attr("aria-expanded",!0),t.slideToggle(Y.j,n),F=t,e))})},showMenu:function(e,t,n){t.is(F)||(N(),F=t,e,t.trigger(new o.a.Event("beforeShow")),t.show(),t.trigger(new o.a.Event("afterShow")),_.a.isFunction(n)&&n())},unregisterMenu:function(e,t){t.is(F)&&N(),e.off("click.menu").removeClass("menutoggle"),t.removeClass("menu")},msg:J,Notification:V,PasswordConfirmation:G.a,Plugins:{_plugins:{},register:function(e,t){var n=this._plugins[e];n||(n=this._plugins[e]=[]),n.push(t)},getPlugins:function(e){return this._plugins[e]||[]},attach:function(e,t,n){for(var i=this.getPlugins(e),r=0;r<i.length;r++)i[r].attach&&i[r].attach(t,n)},detach:function(e,t,n){for(var i=this.getPlugins(e),r=0;r<i.length;r++)i[r].detach&&i[r].detach(t,n)}},search:X,Util:te,debug:ne,generateUrl:q.b,get:(se=window,function(e){for(var t=e.split("."),n=t.pop(),i=0;i<t.length;i++)if(!(se=se[t[i]]))return!1;return se[n]}),set:function(e){return function(t,n){for(var i=t.split("."),r=i.pop(),s=0;s<i.length;s++)e[i[s]]||(e[i[s]]={}),e=e[i[s]];e[r]=n}}(window),getRootPath:q.c,filePath:q.a,redirect:function(e){return window.location=e},reload:function(){return window.location.reload()},linkTo:q.d,linkToOCS:q.e,linkToRemote:q.f,linkToRemoteBase:q.g,webroot:oe};
*/if(void 0===ie){var re=(ie=location.pathname).indexOf("/index.php/");ie=-1!==re?ie.substr(0,re):ie.substr(0,ie.lastIndexOf("/"))}var se,oe=ie,ae=i.a={coreApps:Y.i,menuSpeed:Y.j,PERMISSION_ALL:Y.a,PERMISSION_CREATE:Y.b,PERMISSION_DELETE:Y.c,PERMISSION_NONE:Y.d,PERMISSION_READ:Y.e,PERMISSION_SHARE:Y.f,PERMISSION_UPDATE:Y.g,TAG_FAVORITE:Y.h,addScript:function(e,t,n){var i;console.warn("OC.addScript is deprecated, use OCP.Loader.loadScript instead");var r=OC.filePath(e,"js",t+".js");return a[r]?n&&n():(i=o.a.Deferred(),o.a.getScript(r,function(){return i.resolve()}),a[r]=i),a[r]},addStyle:function(e,t){console.warn("OC.addStyle is deprecated, use OCP.Loader.loadStylesheet instead");var n=OC.filePath(e,"css",t+".css");-1===l.indexOf(n)&&(l.push(n),document.createStyleSheet?document.createStyleSheet(n):(t=o()('<link rel="stylesheet" type="text/css" href="'+n+'"/>'),o()("head").append(t)))},Apps:c.a,AppConfig:h,appConfig:d,appswebroots:p,Backbone:D,ContactsMenu:S.a,config:T,currentUser:H,dialogs:I,EventSource:z,getCurrentUser:function(){return{uid:H,displayName:E}},isUserAdmin:function(){return B},L10N:Q,hideMenus:N,registerMenu:function(e,t,n,i){t.addClass("menu"),e.on("A"===e.prop("tagName")?"click.menu":"click.menu keyup.menu",function(r){r.preventDefault(),r.key&&"Enter"!==r.key||(t.is(F)?N():(F&&N(),!0===i&&t.parent().addClass("openedMenu"),e.attr("aria-expanded",!0),t.slideToggle(Y.j,n),F=t,e))})},showMenu:function(e,t,n){t.is(F)||(N(),F=t,e,t.trigger(new o.a.Event("beforeShow")),t.show(),t.trigger(new o.a.Event("afterShow")),_.a.isFunction(n)&&n())},unregisterMenu:function(e,t){t.is(F)&&N(),e.off("click.menu").removeClass("menutoggle"),t.removeClass("menu")},msg:J,Notification:V,PasswordConfirmation:G.a,Plugins:{_plugins:{},register:function(e,t){var n=this._plugins[e];n||(n=this._plugins[e]=[]),n.push(t)},getPlugins:function(e){return this._plugins[e]||[]},attach:function(e,t,n){for(var i=this.getPlugins(e),r=0;r<i.length;r++)i[r].attach&&i[r].attach(t,n)},detach:function(e,t,n){for(var i=this.getPlugins(e),r=0;r<i.length;r++)i[r].detach&&i[r].detach(t,n)}},search:X,Util:te,debug:ne,generateUrl:q.b,get:(se=window,function(e){for(var t=e.split("."),n=t.pop(),i=0;i<t.length;i++)if(!(se=se[t[i]]))return!1;return se[n]}),set:function(e){return function(t,n){for(var i=t.split("."),r=i.pop(),s=0;s<i.length;s++)e[i[s]]||(e[i[s]]={}),e=e[i[s]];e[r]=n}}(window),getRootPath:q.c,filePath:q.a,redirect:function(e){return window.location=e},reload:function(){return window.location.reload()},linkTo:q.d,linkToOCS:q.e,linkToRemote:q.f,linkToRemoteBase:q.g,webroot:oe};
/*
* @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
*

2
core/js/dist/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
core/src/OC/currentuser.js
View File

@ -22,7 +22,7 @@
const rawUid = document
.getElementsByTagName('head')[0]
.getAttribute('data-user')
const displayname = document
const displayName = document
.getElementsByTagName('head')[0]
.getAttribute('data-user-displayname')
@ -31,6 +31,6 @@ export const currentUser = rawUid !== undefined ? rawUid : false
export const getCurrentUser = () => {
return {
uid: currentUser,
displayname,
displayName,
}
}