You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by st...@apache.org on 2013/01/08 23:39:10 UTC
svn commit: r1430586 - in /lucene/dev/trunk/solr: CHANGES.txt
webapp/web/admin.html webapp/web/js/lib/console.js
webapp/web/js/scripts/app.js webapp/web/js/scripts/cloud.js
webapp/web/js/scripts/plugins.js
Author: steffkes
Date: Tue Jan 8 22:39:10 2013
New Revision: 1430586
URL: http://svn.apache.org/viewvc?rev=1430586&view=rev
Log:
SOLR-3876: Solr Admin UI is completely dysfunctional on IE 9
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/webapp/web/admin.html
lucene/dev/trunk/solr/webapp/web/js/lib/console.js
lucene/dev/trunk/solr/webapp/web/js/scripts/app.js
lucene/dev/trunk/solr/webapp/web/js/scripts/cloud.js
lucene/dev/trunk/solr/webapp/web/js/scripts/plugins.js
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1430586&r1=1430585&r2=1430586&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Jan 8 22:39:10 2013
@@ -495,6 +495,8 @@ Bug Fixes
* SOLR-4170: The 'backup' ReplicationHandler command can sometimes use a stale
index directory rather than the current one. (Mark Miller, Marcin Rzewuck)
+* SOLR-3876: Solr Admin UI is completely dysfunctional on IE 9 (steffkes)
+
Other Changes
----------------------
Modified: lucene/dev/trunk/solr/webapp/web/admin.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/admin.html?rev=1430586&r1=1430585&r2=1430586&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/admin.html (original)
+++ lucene/dev/trunk/solr/webapp/web/admin.html Tue Jan 8 22:39:10 2013
@@ -1,3 +1,4 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<!--
Modified: lucene/dev/trunk/solr/webapp/web/js/lib/console.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/lib/console.js?rev=1430586&r1=1430585&r2=1430586&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/lib/console.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/lib/console.js Tue Jan 8 22:39:10 2013
@@ -15,13 +15,15 @@
limitations under the License.
*/
-if( 'undefined' === typeof( console ) )
+window.console = window.console || {};
+
+var names = ["log", "debug", "info", "warn", "error",
+ "assert", "dir", "dirxml", "group", "groupEnd", "time",
+ "timeEnd", "count", "trace", "profile", "profileEnd"];
+
+var i = 0;
+var l = names.length;
+for( i = 0; i < l; i++ )
{
- var console = {
- log : function() {},
- debug : function() {},
- dump : function() {},
- error : function() {},
- warn : function(){}
- };
-}
\ No newline at end of file
+ window.console[names[i]] = window.console[names[i]] || function() {};
+}
Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/app.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/app.js?rev=1430586&r1=1430585&r2=1430586&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/app.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/app.js Tue Jan 8 22:39:10 2013
@@ -131,7 +131,7 @@ var sammy = $.sammy
var solr_admin = function( app_config )
{
- self = this,
+ that = this,
menu_element = null,
@@ -196,13 +196,13 @@ var solr_admin = function( app_config )
this.set_cores_data = function set_cores_data( cores )
{
- self.cores_data = sort_cores_data( cores.status );
+ that.cores_data = sort_cores_data( cores.status );
- self.menu_element
+ that.menu_element
.empty();
var core_count = 0;
- for( var core_name in self.cores_data )
+ for( var core_name in that.cores_data )
{
core_count++;
var core_path = config.solr_path + '/' + core_name;
@@ -240,7 +240,7 @@ var solr_admin = function( app_config )
+ ' </ul>' + "\n"
+ '</li>';
- self.menu_element
+ that.menu_element
.append( core_tpl );
}
@@ -290,7 +290,7 @@ var solr_admin = function( app_config )
},
success : function( response )
{
- self.set_cores_data( response );
+ that.set_cores_data( response );
for( var core_name in response.status )
{
@@ -312,7 +312,7 @@ var solr_admin = function( app_config )
},
success : function( response )
{
- self.dashboard_values = response;
+ that.dashboard_values = response;
var environment_args = null;
var cloud_args = null;
Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/cloud.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/cloud.js?rev=1430586&r1=1430585&r2=1430586&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/cloud.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/cloud.js Tue Jan 8 22:39:10 2013
@@ -436,7 +436,7 @@ var prepare_graph = function( graph_elem
var shard = {
name: s,
data: {
- type : 'shard',
+ type : 'shard'
},
children: nodes
};
@@ -446,7 +446,7 @@ var prepare_graph = function( graph_elem
var collection = {
name: c,
data: {
- type : 'collection',
+ type : 'collection'
},
children: shards
};
Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/plugins.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/plugins.js?rev=1430586&r1=1430585&r2=1430586&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/plugins.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/plugins.js Tue Jan 8 22:39:10 2013
@@ -287,7 +287,7 @@ var render_plugin_data = function( plugi
var txt = $(this).html();
if(txt.indexOf("http") >= 0) {
$(this).linker({
- className : 'linker',
+ className : 'linker'
});
}
});
@@ -423,4 +423,4 @@ sammy.get
}
);
}
-);
\ No newline at end of file
+);