From 4cae94dcbafc5ce92671b71f2bc52d65289424a8 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 8 Jun 2011 17:44:06 +0200 Subject: [PATCH] split sonia.login.js into smaller pieces --- scm-webapp/src/main/webapp/index.html | 6 +- .../sonia.login.form.js} | 35 +---------- .../webapp/resources/js/login/sonia.login.js | 32 ++++++++++ .../resources/js/login/sonia.login.window.js | 63 +++++++++++++++++++ 4 files changed, 101 insertions(+), 35 deletions(-) rename scm-webapp/src/main/webapp/resources/js/{sonia.login.js => login/sonia.login.form.js} (85%) create mode 100644 scm-webapp/src/main/webapp/resources/js/login/sonia.login.js create mode 100644 scm-webapp/src/main/webapp/resources/js/login/sonia.login.window.js diff --git a/scm-webapp/src/main/webapp/index.html b/scm-webapp/src/main/webapp/index.html index 672abb4ddb..ab02f84ae5 100644 --- a/scm-webapp/src/main/webapp/index.html +++ b/scm-webapp/src/main/webapp/index.html @@ -63,7 +63,11 @@ - + + + + + diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.login.js b/scm-webapp/src/main/webapp/resources/js/login/sonia.login.form.js similarity index 85% rename from scm-webapp/src/main/webapp/resources/js/sonia.login.js rename to scm-webapp/src/main/webapp/resources/js/login/sonia.login.form.js index 840eb105f0..2a4b9418fa 100644 --- a/scm-webapp/src/main/webapp/resources/js/sonia.login.js +++ b/scm-webapp/src/main/webapp/resources/js/login/sonia.login.form.js @@ -1,4 +1,4 @@ -/** +/* * * Copyright (c) 2010, Sebastian Sdorra * All rights reserved. * @@ -29,7 +29,6 @@ * */ -Ext.ns('Sonia.login'); Sonia.login.Form = Ext.extend(Ext.FormPanel,{ @@ -139,35 +138,3 @@ Sonia.login.Form = Ext.extend(Ext.FormPanel,{ }); Ext.reg('soniaLoginForm', Sonia.login.Form); - -Sonia.login.Window = Ext.extend(Ext.Window,{ - - initComponent: function(){ - var form = new Sonia.login.Form(); - form.on('actioncomplete', function(){ - this.fireEvent('success'); - this.close(); - }, this); - form.on('cancel', function(){ - this.close(); - }, this); - - var config = { - layout:'fit', - width:300, - height:150, - closable: false, - resizable: false, - plain: true, - border: false, - modal: true, - items: [form] - }; - - this.addEvents('success'); - - Ext.apply(this, Ext.apply(this.initialConfig, config)); - Sonia.login.Window.superclass.initComponent.apply(this, arguments); - } - -}); diff --git a/scm-webapp/src/main/webapp/resources/js/login/sonia.login.js b/scm-webapp/src/main/webapp/resources/js/login/sonia.login.js new file mode 100644 index 0000000000..66b73b2513 --- /dev/null +++ b/scm-webapp/src/main/webapp/resources/js/login/sonia.login.js @@ -0,0 +1,32 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. Neither the name of SCM-Manager; nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + +Ext.ns('Sonia.login'); diff --git a/scm-webapp/src/main/webapp/resources/js/login/sonia.login.window.js b/scm-webapp/src/main/webapp/resources/js/login/sonia.login.window.js new file mode 100644 index 0000000000..b73236057f --- /dev/null +++ b/scm-webapp/src/main/webapp/resources/js/login/sonia.login.window.js @@ -0,0 +1,63 @@ +/* * + * Copyright (c) 2010, Sebastian Sdorra + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. Neither the name of SCM-Manager; nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + +Sonia.login.Window = Ext.extend(Ext.Window,{ + + initComponent: function(){ + var form = new Sonia.login.Form(); + form.on('actioncomplete', function(){ + this.fireEvent('success'); + this.close(); + }, this); + form.on('cancel', function(){ + this.close(); + }, this); + + var config = { + layout:'fit', + width:300, + height:150, + closable: false, + resizable: false, + plain: true, + border: false, + modal: true, + items: [form] + }; + + this.addEvents('success'); + + Ext.apply(this, Ext.apply(this.initialConfig, config)); + Sonia.login.Window.superclass.initComponent.apply(this, arguments); + } + +});