Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b1c23fb authored by Ronak Patel's avatar Ronak Patel
Browse files

Merge branch 'dev/avg-sorting-issue' into 'master' 

Removed unncessary code for sorting which resets sorting

See merge request e/documentation/user!714
parents ad015a19 7bcc07f6

htdocs/_i18n/en/pages/devices.html

+3 −1
Original line number Diff line number Diff line
@@ -395,7 +395,8 @@ 
				{% assign release_date_array = release_date_array | push: date[0] %}

			{% endif %}

			{% assign releasedates = release_date_array | uniq %}

          <td class="release" data-order="{{ releasedates | array_to_sentence_string: ',' }}">

          <td class="release" data-order="{{ releasedates | array_to_sentence_string: "," }}">

			

            <ul class="list-unstyled">

            {% for releasedate in releasedates %}

              <li>{{ releasedate }}</li>
@@ -445,3 +446,4 @@ 
  </div>

  <!--DEVICE COUNT START-->

</div>

 
 No newline at end of file

htdocs/assets/js/code.js

+29 −21
Original line number Diff line number Diff line
@@ -19,23 +19,23 @@ jQuery.extend( jQuery.fn.dataTableExt.oSort, { 
	}

});



// To allow reseting the sort options, ref https://stackoverflow.com/questions/27008837/jquery-datatable-reset-sorting

jQuery.fn.dataTableExt.oApi.fnSortNeutral = function ( oSettings )

{

    /* Remove any current sorting */

    oSettings.aaSorting = [];



    /* Sort display arrays so we get them in numerical order */

    oSettings.aiDisplay.sort( function (x,y) {

        return x-y;

    } );

    oSettings.aiDisplayMaster.sort( function (x,y) {

        return x-y;

    } );



    /* Redraw */

    oSettings.oApi._fnReDraw( oSettings );

};

// // To allow reseting the sort options, ref https://stackoverflow.com/questions/27008837/jquery-datatable-reset-sorting

// jQuery.fn.dataTableExt.oApi.fnSortNeutral = function ( oSettings )

// {

//     /* Remove any current sorting */

//     oSettings.aaSorting = [];



//     /* Sort display arrays so we get them in numerical order */

//     oSettings.aiDisplay.sort( function (x,y) {

//         return x-y;

//     } );

//     oSettings.aiDisplayMaster.sort( function (x,y) {

//         return x-y;

//     } );



//     /* Redraw */

//     oSettings.oApi._fnReDraw( oSettings );

// };



function updateFilters() {

  $(".smartphone-table tr").filter(function() {
@@ -139,9 +139,6 @@ $(document).ready(function() { 
    fixedHeader: true,

    bFilter: false,

    info: false,

	columnDefs: [

		{ type: 'numeric-comma', targets: 4 }

	],

    "columns": [

      null,

      null,
@@ -151,7 +148,18 @@ $(document).ready(function() { 
      { "type": "any-number" },

      null,

      null,

    ]

    ],

	"initComplete": function(settings, json) {

		var order_type = 'asc';

		if($('.ui-state-default.sorting_desc').length){

			order_type = 'desc';

		}

		if ($('.sorting_1 ul').length > 0) {

		$('.sorting_1 ul').each(function(i, obj) {

			sortList($(this)[0], order_type);

		});

		}

	  }

  });



  $('#smartphone-table').on('order.dt', function() {