From 630acf1f2b2ed18f10e5ece5228e6afff53b0496 Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Tue, 5 Jan 2010 11:38:49 +0100 Subject: [PATCH] apply patch by puddlejumper to make the JS IE compatible --- template/mumble/mumble.htm | 55 +++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/template/mumble/mumble.htm b/template/mumble/mumble.htm index 9156def..9a1ff26 100644 --- a/template/mumble/mumble.htm +++ b/template/mumble/mumble.htm @@ -169,29 +169,29 @@ { name: 'password', type: 'string' }, { name: 'owner', type: 'int' }, { name: 'admin', type: 'bool' }, - { name: 'delete', type: 'bool' }, + { name: 'delete', type: 'bool' } ]); userAdminStore = new Ext.data.Store({ url: '{% url mumble.views.users DBaseObject.id %}', reader: new Ext.data.JsonReader({ root: 'objects', - fields: userRecord, + fields: userRecord }), autoLoad: true, - remoteSort: false, + remoteSort: false }); adminColumn = new Ext.grid.CheckColumn({ header: '{% trans "Admin on root channel" %}', dataIndex: 'admin', - width: 50, + width: 50 }); deleteColumn = new Ext.grid.CheckColumn({ header: '{% trans "Delete" %}', dataIndex: 'delete', - width: 50, + width: 50 }); ownerCombo = new Ext.form.ComboBox({ @@ -205,10 +205,10 @@ url: '{% url mumble.views.djangousers %}', reader: new Ext.data.JsonReader({ fields: [ 'uid', 'uname' ], - root: 'objects', + root: 'objects' }), - autoLoad: true, - }), + autoLoad: true + }) }); {% endif %} @@ -226,13 +226,12 @@ activeTab: {{ DisplayTab }}, items: [ { contentEl: 'mumble_motd', title: '{% trans "Server Info" %}', autoScroll: true }, - { contentEl: 'mumble_registration', - title: '{% trans "Registration" %}', - autoScroll: true, + { contentEl: 'mumble_registration', title: '{% trans "Registration" %}', autoScroll: true, + {% if user.is_authenticated %} listeners: { - activate: function(){ Ext.fly("id_name").focus() }, - }, + activate: function(){ Ext.fly("id_name").focus() } + } {% endif %} }, {% if CurrentUserIsAdmin %} @@ -251,8 +250,8 @@ dataIndex: 'name', sortable: true, editor: new Ext.form.TextField({ - allowBlank: false, - }), + allowBlank: false + }) }, { header: '{% trans "Account owner" %}', dataIndex: 'owner', @@ -264,19 +263,20 @@ for( i = 0; i < items.length; i++ ) if( items[i].data.uid == value ) return items[i].data.uname; - }, + } + }, adminColumn, { header: '{% trans "Change password" %}', dataIndex: 'password', editor: new Ext.form.TextField({ - inputType: 'password', + inputType: 'password' }), renderer: function( value ){ ret = ''; for( i = 0; i < value.length; i++ ) ret += '*'; return ret; - }, + } }, deleteColumn ] ), tbar: [{ text: '{% trans "Add" %}', @@ -287,7 +287,7 @@ admin: false, owner: '', password: '', - 'delete': false, + 'delete': false } ) ); } }, { @@ -300,11 +300,10 @@ data.push(rec.data); } } - var conn = new Ext.data.Connection(); conn.request( { url: userAdminStore.url, - params: { data: Ext.encode( data ), }, + params: { data: Ext.encode( data ) }, success: function(){ for( i = 0; i < userAdminStore.data.items.length; i++ ){ rec = userAdminStore.data.items[i]; @@ -314,26 +313,26 @@ rec.commit(); } } - }, + } } ); } }, { text: '{% trans "Resync with Murmur" %}', handler: function(){ userAdminStore.reload({ - params: { 'resync': 'true' }, + params: { 'resync': 'true' } }); - }, + } }], - plugins: [ adminColumn, deleteColumn ], - }, + plugins: [ adminColumn, deleteColumn ] + } {% endif %} ] - }, + } {% for item in ChannelTable %} { contentEl: 'mumble_{{ item.id }}', id: 'carditem_{{ item.id }}' }, {% endfor %} - ], + ] }); Ext.get( 'link_server' ).on( 'click', function( event, target ){