Removed sorting of 1-Wire devices because the busy indicator doesn't dissapear

Wed, 23 Jul 2014 21:34:02 +0200

author
Michiel Broek <mbroek@mbse.eu>
date
Wed, 23 Jul 2014 21:34:02 +0200
changeset 129
2817c65fba89
parent 128
81b9167c1e93
child 130
25158b08843f

Removed sorting of 1-Wire devices because the busy indicator doesn't dissapear

www-thermferm/index.php file | annotate | diff | comparison | revisions
www-thermferm/js/maintenance_panel.js file | annotate | diff | comparison | revisions
--- a/www-thermferm/index.php	Wed Jul 23 21:18:05 2014 +0200
+++ b/www-thermferm/index.php	Wed Jul 23 21:34:02 2014 +0200
@@ -51,7 +51,6 @@
 $outstr .= '  <script type="text/javascript" src="jqwidgets/jqxscrollbar.js"></script>'.PHP_EOL;
 $outstr .= '  <script type="text/javascript" src="jqwidgets/jqxgrid.js"></script>'.PHP_EOL;
 $outstr .= '  <script type="text/javascript" src="jqwidgets/jqxgrid.selection.js"></script>'.PHP_EOL;
-$outstr .= '  <script type="text/javascript" src="jqwidgets/jqxgrid.sort.js"></script>'.PHP_EOL;
 $outstr .= '  <script type="text/javascript" src="jqwidgets/jqxgrid.columnsresize.js"></script>'.PHP_EOL;
 $outstr .= ' </head>'.PHP_EOL;
 
--- a/www-thermferm/js/maintenance_panel.js	Wed Jul 23 21:18:05 2014 +0200
+++ b/www-thermferm/js/maintenance_panel.js	Wed Jul 23 21:34:02 2014 +0200
@@ -29,15 +29,9 @@
        	    { name: 'Chip', type: 'string' },
        	    { name: 'Description', type: 'string' }
      	],
-     	url: 'getbus.php',
-     	sortcolumn: 'Address',
-     	sortdirection: 'asc'
+     	url: 'getbus.php'
     };
-    var dataAdapter_bus = new $.jqx.dataAdapter(source_bus,{
-	downloadComplete: function (data, status, xhr) { },
-        loadComplete: function (data) { },
-        loadError: function (xhr, status, error) { }
-    });
+    var dataAdapter_bus = new $.jqx.dataAdapter(source_bus);
     $("#jqxgrid_bus").jqxGrid( {
 	width: 770, height: 280,
 	source: dataAdapter_bus,

mercurial