Update AdminLTE

- from 2.4.5 to 2.4.18 (cannot detect any issues)
- set default scancycle for Apple Devices to 1

front/lib/AdminLTE/bower_components/select2/tests/data/array-tests.js

@@ -3,6 +3,16 @@ module('Data adapters - Array');
 var ArrayData = require('select2/data/array');
 var $ = require('jquery');
 var Options = require('select2/options');
+var Utils = require('select2/utils');
+
+var UserDefinedType = function (id, text) {
+  var self = this;
+
+  self.id = id;
+  self.text = text;
+
+  return self;
+};
 
 var arrayOptions = new Options({
   data: [
@@ -17,7 +27,8 @@ var arrayOptions = new Options({
     {
       id: '2',
       text: '2'
-    }
+    },
+    new UserDefinedType(1, 'aaaaaa')
   ]
 });
 
@@ -182,7 +193,10 @@ test('multiple sets the value', function (assert) {
 
   var data = new ArrayData($select, arrayOptions);
 
-  assert.equal($select.val(), null);
+  assert.ok(
+    $select.val() == null || $select.val().length == 0,
+    'nothing should be selected'
+  );
 
   data.select({
     id: 'default',
@@ -216,7 +230,7 @@ test('option tags are automatically generated', function (assert) {
 
   assert.equal(
     $select.find('option').length,
-    3,
+    4,
     'An <option> element should be created for each object'
   );
 });
@@ -237,7 +251,7 @@ test('option tags can receive new data', function(assert) {
   });
 
   assert.ok(
-    $select.find(':selected').data('data').extra,
+    Utils.GetData($select.find(':selected')[0], 'data').extra,
     '<option> default should have new data'
   );
 
@@ -246,7 +260,7 @@ test('option tags can receive new data', function(assert) {
   });
 
   assert.ok(
-    $select.find(':selected').data('data').extra,
+    Utils.GetData($select.find(':selected')[0], 'data').extra,
     '<option> One should have new data'
   );
 });

front/lib/AdminLTE/bower_components/select2/tests/data/select-tests.js

@@ -130,7 +130,10 @@ test('multiple sets the value', function (assert) {
 
   var data = new SelectData($select, selectOptions);
 
-  assert.equal($select.val(), null);
+  assert.ok(
+    $select.val() == null || $select.val().length == 0,
+    'nothing should be selected'
+  );
 
   data.select({
     id: 'Two',
@@ -487,3 +490,68 @@ test('select option construction accepts id="" (empty string) value',
     'Built option value should be an empty string.'
   );
 });
+
+test('user-defined types are normalized properly', function (assert) {
+  var $select = $('#qunit-fixture .user-defined'),
+
+  UserDefinedType = function (id, text) {
+    var self = this;
+
+    self.id = id;
+    self.text = text;
+
+    return self;
+  };
+
+  var testData = [
+    'Test',
+    {
+        id: 4,
+        text: 'item'
+    },
+    new UserDefinedType(1, 'aaaaaa')
+  ];
+
+  var data = new SelectData($select, selectOptions);
+
+  var normalizedItem = data._normalizeItem(testData[0]);
+  var normalizedItem2 = data._normalizeItem(testData[1]);
+  var normalizedItem3 = data._normalizeItem(testData[2]);
+
+  assert.equal(
+    testData[0],
+    normalizedItem.id,
+    'id property should be equal to text after normalize'
+  );
+
+  assert.equal(
+    testData[0],
+    normalizedItem.text,
+    'text property should be equal after normalize'
+  );
+
+  assert.equal(
+    testData[1].id,
+    normalizedItem2.id,
+    'id property should be equal after normalize'
+  );
+
+  assert.equal(
+    testData[1].text,
+    normalizedItem2.text,
+    'text property should be equal after normalize'
+  );
+
+  assert.equal(
+    testData[2].id,
+    normalizedItem3.id,
+    'id property should be equal after normalize'
+  );
+
+  assert.equal(
+    testData[2].text,
+    normalizedItem3.text,
+    'text property should be equal after normalize'
+  );
+
+});