Bladeren bron

Started building out the examples

This also adds the `select2` function back to jQuery, so you can
still initialize Select2 using the old syntax.
Kevin Brown 10 jaren geleden
bovenliggende
commit
d386849c1f

+ 20 - 16
Gruntfile.js

@@ -1,20 +1,24 @@
 module.exports = function (grunt) {
   // Full list of files that must be included by RequireJS
-  amd_includes = [
-    "almond"
-  ]
+  includes = [
+    'jquery.select2'
+  ];
 
-  full_includes = [
-    "jquery"
-  ]
+  amdIncludes = [
+    'almond'
+  ];
+
+  fullIncludes = [
+    'jquery'
+  ].concat(includes);
 
   grunt.initConfig({
     uglify: {
-      "dist": {
+      'dist': {
         src: 'dist/js/select2.js',
         dest: 'dist/js/select2.min.js'
       },
-      "dist.full": {
+      'dist.full': {
         src: 'dist/js/select2.full.js',
         dest: 'dist/js/select2.full.min.js'
       }
@@ -22,7 +26,7 @@ module.exports = function (grunt) {
 
     qunit: {
       all: [
-        "tests/**/*.html"
+        'tests/**/*.html'
       ]
     },
 
@@ -70,7 +74,7 @@ module.exports = function (grunt) {
           optimize: "none",
           name: "select2/core",
           out: "dist/js/select2.js",
-          include: amd_includes,
+          include: amdIncludes.concat(includes),
           paths: {
             almond: "../../vendor/almond-0.2.9",
             jquery: "jquery.shim"
@@ -83,7 +87,7 @@ module.exports = function (grunt) {
           optimize: "none",
           name: "select2/core",
           out: "dist/js/select2.full.js",
-          include: amd_includes.concat(full_includes),
+          include: amdIncludes.concat(fullIncludes),
           paths: {
             almond: "../../vendor/almond-0.2.9",
             jquery: "../../vendor/jquery-2.1.0"
@@ -107,7 +111,7 @@ module.exports = function (grunt) {
           optimize: "none",
           name: "select2/core",
           out: "dist/js/select2.amd.full.js",
-          include: full_includes,
+          include: fullIncludes,
           paths: {
             jquery: "empty:"
           }
@@ -118,17 +122,17 @@ module.exports = function (grunt) {
     concat: {
       "dist": {
         src: [
-          "src/coffee/start.js",
+          "src/js/start.js",
           "dist/js/select2.js",
-          "src/coffee/end.js"
+          "src/js/end.js"
         ],
         dest: "dist/js/select2.js"
       },
       "dist.full": {
         src: [
-          "src/coffee/start.js",
+          "src/js/start.js",
           "dist/js/select2.full.js",
-          "src/coffee/end.js"
+          "src/js/end.js"
         ],
         dest: "dist/js/select2.full.js"
       }

+ 198 - 166
dist/js/select2.amd.full.js

@@ -137,166 +137,6 @@ define('select2/utils',[], function () {
   return Utils;
 });
 
-define('select2/data/base',[
-  '../utils'
-], function (Utils) {
-  function BaseAdapter ($element, options) {
-    BaseAdapter.__super__.constructor.call(this);
-  }
-
-  Utils.Extend(BaseAdapter, Utils.Observable);
-
-  BaseAdapter.prototype.current = function (callback) {
-    throw new Error('The `current` method must be defined in child classes.');
-  };
-
-  BaseAdapter.prototype.query = function (params, callback) {
-    throw new Error('The `query` method must be defined in child classes.');
-  };
-
-  return BaseAdapter;
-});
-
-define('select2/data/select',[
-  './base',
-  '../utils',
-  'jquery'
-], function (BaseAdapter, Utils, $) {
-  function SelectAdapter ($element, options) {
-    this.$element = $element;
-
-    SelectAdapter.__super__.constructor.call(this);
-  }
-
-  Utils.Extend(SelectAdapter, BaseAdapter);
-
-  SelectAdapter.prototype.current = function (callback) {
-    var data = [];
-    var self = this;
-
-    this.$element.find(':selected').each(function () {
-      var $option = $(this);
-
-      var option = self.item($option);
-
-      data.push(option);
-    });
-
-    callback(data);
-  };
-
-  SelectAdapter.prototype.select = function (data) {
-    var self = this;
-
-    if (this.$element.prop('multiple')) {
-      this.current(function (currentData) {
-        var val = [];
-
-        data = [data];
-        data.push.apply(data, currentData);
-
-        for (var d = 0; d < data.length; d++) {
-          id = data[d].id;
-
-          if (val.indexOf(id) === -1) {
-            val.push(id);
-          }
-        }
-
-        self.$element.val(val);
-        self.$element.trigger('change');
-      });
-    } else {
-      var val = data.id;
-
-      this.$element.val(val);
-      this.$element.trigger('change');
-    }
-  };
-
-  SelectAdapter.prototype.unselect = function (data) {
-    var self = this;
-
-    if (!this.$element.prop('multiple')) {
-      return;
-    }
-
-    this.current(function (currentData) {
-      var val = [];
-
-      for (var d = 0; d < currentData.length; d++) {
-        id = currentData[d].id;
-
-        if (id !== data.id && val.indexOf(id) === -1) {
-          val.push(id);
-        }
-      }
-
-      self.$element.val(val);
-      self.$element.trigger('change');
-    });
-  };
-
-  SelectAdapter.prototype.bind = function (container, $container) {
-    var self = this;
-
-    container.on('select', function (params) {
-      self.select(params.data);
-    });
-
-    container.on('unselect', function (params) {
-      self.unselect(params.data);
-    });
-  };
-
-  SelectAdapter.prototype.query = function (params, callback) {
-    var data = [];
-    var self = this;
-
-    this.$element.find('option').each(function () {
-      var $option = $(this);
-
-      var option = self.item($option);
-
-      if (self.matches(params, option)) {
-        data.push(option);
-      }
-    });
-
-    callback(data);
-  };
-
-  SelectAdapter.prototype.item = function ($option) {
-    var data = $option.data('data');
-
-    // If the data has already be generated, use it
-    if (data == null) {
-      data = {
-        id: $option.val(),
-        text: $option.html()
-      };
-
-      $option.data('data', data);
-    }
-
-    return data;
-  };
-
-  SelectAdapter.prototype.matches = function (params, data) {
-    if ($.trim(params.term) === '') {
-      return true;
-    }
-
-    if (data.text.indexOf(params.term) > -1) {
-      return true;
-    }
-
-    return false;
-  };
-
-  return SelectAdapter;
-});
-
 define('select2/results',[
   './utils'
 ], function (Utils) {
@@ -351,7 +191,7 @@ define('select2/results',[
         var $option = $(this);
         var item = $option.data('data');
 
-        if (selected.indexOf(item.id) > -1) {
+        if (selected.indexOf(item.id.toString()) > -1) {
           $option.addClass('selected');
         }
       });
@@ -584,6 +424,166 @@ define('select2/selection/multiple',[
   return MultipleSelection;
 });
 
+define('select2/data/base',[
+  '../utils'
+], function (Utils) {
+  function BaseAdapter ($element, options) {
+    BaseAdapter.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(BaseAdapter, Utils.Observable);
+
+  BaseAdapter.prototype.current = function (callback) {
+    throw new Error('The `current` method must be defined in child classes.');
+  };
+
+  BaseAdapter.prototype.query = function (params, callback) {
+    throw new Error('The `query` method must be defined in child classes.');
+  };
+
+  return BaseAdapter;
+});
+
+define('select2/data/select',[
+  './base',
+  '../utils',
+  'jquery'
+], function (BaseAdapter, Utils, $) {
+  function SelectAdapter ($element, options) {
+    this.$element = $element;
+
+    SelectAdapter.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(SelectAdapter, BaseAdapter);
+
+  SelectAdapter.prototype.current = function (callback) {
+    var data = [];
+    var self = this;
+
+    this.$element.find(':selected').each(function () {
+      var $option = $(this);
+
+      var option = self.item($option);
+
+      data.push(option);
+    });
+
+    callback(data);
+  };
+
+  SelectAdapter.prototype.select = function (data) {
+    var self = this;
+
+    if (this.$element.prop('multiple')) {
+      this.current(function (currentData) {
+        var val = [];
+
+        data = [data];
+        data.push.apply(data, currentData);
+
+        for (var d = 0; d < data.length; d++) {
+          id = data[d].id;
+
+          if (val.indexOf(id) === -1) {
+            val.push(id);
+          }
+        }
+
+        self.$element.val(val);
+        self.$element.trigger('change');
+      });
+    } else {
+      var val = data.id;
+
+      this.$element.val(val);
+      this.$element.trigger('change');
+    }
+  };
+
+  SelectAdapter.prototype.unselect = function (data) {
+    var self = this;
+
+    if (!this.$element.prop('multiple')) {
+      return;
+    }
+
+    this.current(function (currentData) {
+      var val = [];
+
+      for (var d = 0; d < currentData.length; d++) {
+        id = currentData[d].id;
+
+        if (id !== data.id && val.indexOf(id) === -1) {
+          val.push(id);
+        }
+      }
+
+      self.$element.val(val);
+      self.$element.trigger('change');
+    });
+  };
+
+  SelectAdapter.prototype.bind = function (container, $container) {
+    var self = this;
+
+    container.on('select', function (params) {
+      self.select(params.data);
+    });
+
+    container.on('unselect', function (params) {
+      self.unselect(params.data);
+    });
+  };
+
+  SelectAdapter.prototype.query = function (params, callback) {
+    var data = [];
+    var self = this;
+
+    this.$element.find('option').each(function () {
+      var $option = $(this);
+
+      var option = self.item($option);
+
+      if (self.matches(params, option)) {
+        data.push(option);
+      }
+    });
+
+    callback(data);
+  };
+
+  SelectAdapter.prototype.item = function ($option) {
+    var data = $option.data('data');
+
+    // If the data has already be generated, use it
+    if (data == null) {
+      data = {
+        id: $option.val(),
+        text: $option.html()
+      };
+
+      $option.data('data', data);
+    }
+
+    return data;
+  };
+
+  SelectAdapter.prototype.matches = function (params, data) {
+    if ($.trim(params.term) === '') {
+      return true;
+    }
+
+    if (data.text.indexOf(params.term) > -1) {
+      return true;
+    }
+
+    return false;
+  };
+
+  return SelectAdapter;
+});
+
 define('select2/data/array',[
   './select',
   '../utils'
@@ -603,7 +603,7 @@ define('select2/data/array',[
       var $option = $(this);
       var option = self.item($option);
 
-      if (option.id == data.id) {
+      if (option.id == data.id.toString()) {
         $option.remove();
       }
     });
@@ -690,7 +690,6 @@ define('select2/data/ajax',[
 });
 
 define('select2/options',[
-  './data/select',
   './results',
 
   './dropdown',
@@ -698,14 +697,22 @@ define('select2/options',[
   './selection/single',
   './selection/multiple',
 
+  './data/select',
   './data/array',
   './data/ajax'
-], function (SelectData, ResultsList, Dropdown, SingleSelection,
-             MultipleSelection) {
+], function (ResultsList, Dropdown, SingleSelection, MultipleSelection,
+             SelectData, ArrayData, AjaxData) {
   function Options (options) {
     this.options = options;
 
-    this.dataAdapter = options.dataAdapter || SelectData;
+    if (options.ajax) {
+      this.dataAdapter = this.dataAdapter || AjaxData;
+    } else if (options.data) {
+      this.dataAdapter = this.dataAdapter || ArrayData;
+    } else {
+      this.dataAdapter = this.dataAdapter || SelectData;
+    }
+
     this.resultsAdapter = ResultsList;
     this.dropdownAdapter = options.dropdownAdapter || Dropdown;
     this.selectionAdapter = options.selectionAdapter;
@@ -852,3 +859,28 @@ define('select2/core',[
   return Select2;
 });
 
+define('jquery.select2',[
+  'jquery',
+  'select2/core'
+], function ($, Select2) {
+  if ($.fn.select2 == null) {
+    $.fn.select2 = function (options) {
+      options = options || {};
+
+      if (typeof options === 'object') {
+        this.each(function () {
+          var instance = new Select2($(this), options);
+        });
+      } else if (typeof options === 'string') {
+        var instance = this.data('select2');
+
+        instance[options](arguments.slice(1));
+      } else {
+        throw new Error('Invalid arguments for Select2: ' + options);
+      }
+    };
+  }
+
+  return Select2;
+});
+

+ 173 - 166
dist/js/select2.amd.js

@@ -137,166 +137,6 @@ define('select2/utils',[], function () {
   return Utils;
 });
 
-define('select2/data/base',[
-  '../utils'
-], function (Utils) {
-  function BaseAdapter ($element, options) {
-    BaseAdapter.__super__.constructor.call(this);
-  }
-
-  Utils.Extend(BaseAdapter, Utils.Observable);
-
-  BaseAdapter.prototype.current = function (callback) {
-    throw new Error('The `current` method must be defined in child classes.');
-  };
-
-  BaseAdapter.prototype.query = function (params, callback) {
-    throw new Error('The `query` method must be defined in child classes.');
-  };
-
-  return BaseAdapter;
-});
-
-define('select2/data/select',[
-  './base',
-  '../utils',
-  'jquery'
-], function (BaseAdapter, Utils, $) {
-  function SelectAdapter ($element, options) {
-    this.$element = $element;
-
-    SelectAdapter.__super__.constructor.call(this);
-  }
-
-  Utils.Extend(SelectAdapter, BaseAdapter);
-
-  SelectAdapter.prototype.current = function (callback) {
-    var data = [];
-    var self = this;
-
-    this.$element.find(':selected').each(function () {
-      var $option = $(this);
-
-      var option = self.item($option);
-
-      data.push(option);
-    });
-
-    callback(data);
-  };
-
-  SelectAdapter.prototype.select = function (data) {
-    var self = this;
-
-    if (this.$element.prop('multiple')) {
-      this.current(function (currentData) {
-        var val = [];
-
-        data = [data];
-        data.push.apply(data, currentData);
-
-        for (var d = 0; d < data.length; d++) {
-          id = data[d].id;
-
-          if (val.indexOf(id) === -1) {
-            val.push(id);
-          }
-        }
-
-        self.$element.val(val);
-        self.$element.trigger('change');
-      });
-    } else {
-      var val = data.id;
-
-      this.$element.val(val);
-      this.$element.trigger('change');
-    }
-  };
-
-  SelectAdapter.prototype.unselect = function (data) {
-    var self = this;
-
-    if (!this.$element.prop('multiple')) {
-      return;
-    }
-
-    this.current(function (currentData) {
-      var val = [];
-
-      for (var d = 0; d < currentData.length; d++) {
-        id = currentData[d].id;
-
-        if (id !== data.id && val.indexOf(id) === -1) {
-          val.push(id);
-        }
-      }
-
-      self.$element.val(val);
-      self.$element.trigger('change');
-    });
-  };
-
-  SelectAdapter.prototype.bind = function (container, $container) {
-    var self = this;
-
-    container.on('select', function (params) {
-      self.select(params.data);
-    });
-
-    container.on('unselect', function (params) {
-      self.unselect(params.data);
-    });
-  };
-
-  SelectAdapter.prototype.query = function (params, callback) {
-    var data = [];
-    var self = this;
-
-    this.$element.find('option').each(function () {
-      var $option = $(this);
-
-      var option = self.item($option);
-
-      if (self.matches(params, option)) {
-        data.push(option);
-      }
-    });
-
-    callback(data);
-  };
-
-  SelectAdapter.prototype.item = function ($option) {
-    var data = $option.data('data');
-
-    // If the data has already be generated, use it
-    if (data == null) {
-      data = {
-        id: $option.val(),
-        text: $option.html()
-      };
-
-      $option.data('data', data);
-    }
-
-    return data;
-  };
-
-  SelectAdapter.prototype.matches = function (params, data) {
-    if ($.trim(params.term) === '') {
-      return true;
-    }
-
-    if (data.text.indexOf(params.term) > -1) {
-      return true;
-    }
-
-    return false;
-  };
-
-  return SelectAdapter;
-});
-
 define('select2/results',[
   './utils'
 ], function (Utils) {
@@ -351,7 +191,7 @@ define('select2/results',[
         var $option = $(this);
         var item = $option.data('data');
 
-        if (selected.indexOf(item.id) > -1) {
+        if (selected.indexOf(item.id.toString()) > -1) {
           $option.addClass('selected');
         }
       });
@@ -584,6 +424,166 @@ define('select2/selection/multiple',[
   return MultipleSelection;
 });
 
+define('select2/data/base',[
+  '../utils'
+], function (Utils) {
+  function BaseAdapter ($element, options) {
+    BaseAdapter.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(BaseAdapter, Utils.Observable);
+
+  BaseAdapter.prototype.current = function (callback) {
+    throw new Error('The `current` method must be defined in child classes.');
+  };
+
+  BaseAdapter.prototype.query = function (params, callback) {
+    throw new Error('The `query` method must be defined in child classes.');
+  };
+
+  return BaseAdapter;
+});
+
+define('select2/data/select',[
+  './base',
+  '../utils',
+  'jquery'
+], function (BaseAdapter, Utils, $) {
+  function SelectAdapter ($element, options) {
+    this.$element = $element;
+
+    SelectAdapter.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(SelectAdapter, BaseAdapter);
+
+  SelectAdapter.prototype.current = function (callback) {
+    var data = [];
+    var self = this;
+
+    this.$element.find(':selected').each(function () {
+      var $option = $(this);
+
+      var option = self.item($option);
+
+      data.push(option);
+    });
+
+    callback(data);
+  };
+
+  SelectAdapter.prototype.select = function (data) {
+    var self = this;
+
+    if (this.$element.prop('multiple')) {
+      this.current(function (currentData) {
+        var val = [];
+
+        data = [data];
+        data.push.apply(data, currentData);
+
+        for (var d = 0; d < data.length; d++) {
+          id = data[d].id;
+
+          if (val.indexOf(id) === -1) {
+            val.push(id);
+          }
+        }
+
+        self.$element.val(val);
+        self.$element.trigger('change');
+      });
+    } else {
+      var val = data.id;
+
+      this.$element.val(val);
+      this.$element.trigger('change');
+    }
+  };
+
+  SelectAdapter.prototype.unselect = function (data) {
+    var self = this;
+
+    if (!this.$element.prop('multiple')) {
+      return;
+    }
+
+    this.current(function (currentData) {
+      var val = [];
+
+      for (var d = 0; d < currentData.length; d++) {
+        id = currentData[d].id;
+
+        if (id !== data.id && val.indexOf(id) === -1) {
+          val.push(id);
+        }
+      }
+
+      self.$element.val(val);
+      self.$element.trigger('change');
+    });
+  };
+
+  SelectAdapter.prototype.bind = function (container, $container) {
+    var self = this;
+
+    container.on('select', function (params) {
+      self.select(params.data);
+    });
+
+    container.on('unselect', function (params) {
+      self.unselect(params.data);
+    });
+  };
+
+  SelectAdapter.prototype.query = function (params, callback) {
+    var data = [];
+    var self = this;
+
+    this.$element.find('option').each(function () {
+      var $option = $(this);
+
+      var option = self.item($option);
+
+      if (self.matches(params, option)) {
+        data.push(option);
+      }
+    });
+
+    callback(data);
+  };
+
+  SelectAdapter.prototype.item = function ($option) {
+    var data = $option.data('data');
+
+    // If the data has already be generated, use it
+    if (data == null) {
+      data = {
+        id: $option.val(),
+        text: $option.html()
+      };
+
+      $option.data('data', data);
+    }
+
+    return data;
+  };
+
+  SelectAdapter.prototype.matches = function (params, data) {
+    if ($.trim(params.term) === '') {
+      return true;
+    }
+
+    if (data.text.indexOf(params.term) > -1) {
+      return true;
+    }
+
+    return false;
+  };
+
+  return SelectAdapter;
+});
+
 define('select2/data/array',[
   './select',
   '../utils'
@@ -603,7 +603,7 @@ define('select2/data/array',[
       var $option = $(this);
       var option = self.item($option);
 
-      if (option.id == data.id) {
+      if (option.id == data.id.toString()) {
         $option.remove();
       }
     });
@@ -690,7 +690,6 @@ define('select2/data/ajax',[
 });
 
 define('select2/options',[
-  './data/select',
   './results',
 
   './dropdown',
@@ -698,14 +697,22 @@ define('select2/options',[
   './selection/single',
   './selection/multiple',
 
+  './data/select',
   './data/array',
   './data/ajax'
-], function (SelectData, ResultsList, Dropdown, SingleSelection,
-             MultipleSelection) {
+], function (ResultsList, Dropdown, SingleSelection, MultipleSelection,
+             SelectData, ArrayData, AjaxData) {
   function Options (options) {
     this.options = options;
 
-    this.dataAdapter = options.dataAdapter || SelectData;
+    if (options.ajax) {
+      this.dataAdapter = this.dataAdapter || AjaxData;
+    } else if (options.data) {
+      this.dataAdapter = this.dataAdapter || ArrayData;
+    } else {
+      this.dataAdapter = this.dataAdapter || SelectData;
+    }
+
     this.resultsAdapter = ResultsList;
     this.dropdownAdapter = options.dropdownAdapter || Dropdown;
     this.selectionAdapter = options.selectionAdapter;

+ 201 - 166
dist/js/select2.full.js

@@ -1,3 +1,4 @@
+
 /**
  * @license almond 0.2.9 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
@@ -9674,166 +9675,6 @@ define('select2/utils',[], function () {
   return Utils;
 });
 
-define('select2/data/base',[
-  '../utils'
-], function (Utils) {
-  function BaseAdapter ($element, options) {
-    BaseAdapter.__super__.constructor.call(this);
-  }
-
-  Utils.Extend(BaseAdapter, Utils.Observable);
-
-  BaseAdapter.prototype.current = function (callback) {
-    throw new Error('The `current` method must be defined in child classes.');
-  };
-
-  BaseAdapter.prototype.query = function (params, callback) {
-    throw new Error('The `query` method must be defined in child classes.');
-  };
-
-  return BaseAdapter;
-});
-
-define('select2/data/select',[
-  './base',
-  '../utils',
-  'jquery'
-], function (BaseAdapter, Utils, $) {
-  function SelectAdapter ($element, options) {
-    this.$element = $element;
-
-    SelectAdapter.__super__.constructor.call(this);
-  }
-
-  Utils.Extend(SelectAdapter, BaseAdapter);
-
-  SelectAdapter.prototype.current = function (callback) {
-    var data = [];
-    var self = this;
-
-    this.$element.find(':selected').each(function () {
-      var $option = $(this);
-
-      var option = self.item($option);
-
-      data.push(option);
-    });
-
-    callback(data);
-  };
-
-  SelectAdapter.prototype.select = function (data) {
-    var self = this;
-
-    if (this.$element.prop('multiple')) {
-      this.current(function (currentData) {
-        var val = [];
-
-        data = [data];
-        data.push.apply(data, currentData);
-
-        for (var d = 0; d < data.length; d++) {
-          id = data[d].id;
-
-          if (val.indexOf(id) === -1) {
-            val.push(id);
-          }
-        }
-
-        self.$element.val(val);
-        self.$element.trigger('change');
-      });
-    } else {
-      var val = data.id;
-
-      this.$element.val(val);
-      this.$element.trigger('change');
-    }
-  };
-
-  SelectAdapter.prototype.unselect = function (data) {
-    var self = this;
-
-    if (!this.$element.prop('multiple')) {
-      return;
-    }
-
-    this.current(function (currentData) {
-      var val = [];
-
-      for (var d = 0; d < currentData.length; d++) {
-        id = currentData[d].id;
-
-        if (id !== data.id && val.indexOf(id) === -1) {
-          val.push(id);
-        }
-      }
-
-      self.$element.val(val);
-      self.$element.trigger('change');
-    });
-  };
-
-  SelectAdapter.prototype.bind = function (container, $container) {
-    var self = this;
-
-    container.on('select', function (params) {
-      self.select(params.data);
-    });
-
-    container.on('unselect', function (params) {
-      self.unselect(params.data);
-    });
-  };
-
-  SelectAdapter.prototype.query = function (params, callback) {
-    var data = [];
-    var self = this;
-
-    this.$element.find('option').each(function () {
-      var $option = $(this);
-
-      var option = self.item($option);
-
-      if (self.matches(params, option)) {
-        data.push(option);
-      }
-    });
-
-    callback(data);
-  };
-
-  SelectAdapter.prototype.item = function ($option) {
-    var data = $option.data('data');
-
-    // If the data has already be generated, use it
-    if (data == null) {
-      data = {
-        id: $option.val(),
-        text: $option.html()
-      };
-
-      $option.data('data', data);
-    }
-
-    return data;
-  };
-
-  SelectAdapter.prototype.matches = function (params, data) {
-    if ($.trim(params.term) === '') {
-      return true;
-    }
-
-    if (data.text.indexOf(params.term) > -1) {
-      return true;
-    }
-
-    return false;
-  };
-
-  return SelectAdapter;
-});
-
 define('select2/results',[
   './utils'
 ], function (Utils) {
@@ -9888,7 +9729,7 @@ define('select2/results',[
         var $option = $(this);
         var item = $option.data('data');
 
-        if (selected.indexOf(item.id) > -1) {
+        if (selected.indexOf(item.id.toString()) > -1) {
           $option.addClass('selected');
         }
       });
@@ -10121,6 +9962,166 @@ define('select2/selection/multiple',[
   return MultipleSelection;
 });
 
+define('select2/data/base',[
+  '../utils'
+], function (Utils) {
+  function BaseAdapter ($element, options) {
+    BaseAdapter.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(BaseAdapter, Utils.Observable);
+
+  BaseAdapter.prototype.current = function (callback) {
+    throw new Error('The `current` method must be defined in child classes.');
+  };
+
+  BaseAdapter.prototype.query = function (params, callback) {
+    throw new Error('The `query` method must be defined in child classes.');
+  };
+
+  return BaseAdapter;
+});
+
+define('select2/data/select',[
+  './base',
+  '../utils',
+  'jquery'
+], function (BaseAdapter, Utils, $) {
+  function SelectAdapter ($element, options) {
+    this.$element = $element;
+
+    SelectAdapter.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(SelectAdapter, BaseAdapter);
+
+  SelectAdapter.prototype.current = function (callback) {
+    var data = [];
+    var self = this;
+
+    this.$element.find(':selected').each(function () {
+      var $option = $(this);
+
+      var option = self.item($option);
+
+      data.push(option);
+    });
+
+    callback(data);
+  };
+
+  SelectAdapter.prototype.select = function (data) {
+    var self = this;
+
+    if (this.$element.prop('multiple')) {
+      this.current(function (currentData) {
+        var val = [];
+
+        data = [data];
+        data.push.apply(data, currentData);
+
+        for (var d = 0; d < data.length; d++) {
+          id = data[d].id;
+
+          if (val.indexOf(id) === -1) {
+            val.push(id);
+          }
+        }
+
+        self.$element.val(val);
+        self.$element.trigger('change');
+      });
+    } else {
+      var val = data.id;
+
+      this.$element.val(val);
+      this.$element.trigger('change');
+    }
+  };
+
+  SelectAdapter.prototype.unselect = function (data) {
+    var self = this;
+
+    if (!this.$element.prop('multiple')) {
+      return;
+    }
+
+    this.current(function (currentData) {
+      var val = [];
+
+      for (var d = 0; d < currentData.length; d++) {
+        id = currentData[d].id;
+
+        if (id !== data.id && val.indexOf(id) === -1) {
+          val.push(id);
+        }
+      }
+
+      self.$element.val(val);
+      self.$element.trigger('change');
+    });
+  };
+
+  SelectAdapter.prototype.bind = function (container, $container) {
+    var self = this;
+
+    container.on('select', function (params) {
+      self.select(params.data);
+    });
+
+    container.on('unselect', function (params) {
+      self.unselect(params.data);
+    });
+  };
+
+  SelectAdapter.prototype.query = function (params, callback) {
+    var data = [];
+    var self = this;
+
+    this.$element.find('option').each(function () {
+      var $option = $(this);
+
+      var option = self.item($option);
+
+      if (self.matches(params, option)) {
+        data.push(option);
+      }
+    });
+
+    callback(data);
+  };
+
+  SelectAdapter.prototype.item = function ($option) {
+    var data = $option.data('data');
+
+    // If the data has already be generated, use it
+    if (data == null) {
+      data = {
+        id: $option.val(),
+        text: $option.html()
+      };
+
+      $option.data('data', data);
+    }
+
+    return data;
+  };
+
+  SelectAdapter.prototype.matches = function (params, data) {
+    if ($.trim(params.term) === '') {
+      return true;
+    }
+
+    if (data.text.indexOf(params.term) > -1) {
+      return true;
+    }
+
+    return false;
+  };
+
+  return SelectAdapter;
+});
+
 define('select2/data/array',[
   './select',
   '../utils'
@@ -10140,7 +10141,7 @@ define('select2/data/array',[
       var $option = $(this);
       var option = self.item($option);
 
-      if (option.id == data.id) {
+      if (option.id == data.id.toString()) {
         $option.remove();
       }
     });
@@ -10227,7 +10228,6 @@ define('select2/data/ajax',[
 });
 
 define('select2/options',[
-  './data/select',
   './results',
 
   './dropdown',
@@ -10235,14 +10235,22 @@ define('select2/options',[
   './selection/single',
   './selection/multiple',
 
+  './data/select',
   './data/array',
   './data/ajax'
-], function (SelectData, ResultsList, Dropdown, SingleSelection,
-             MultipleSelection) {
+], function (ResultsList, Dropdown, SingleSelection, MultipleSelection,
+             SelectData, ArrayData, AjaxData) {
   function Options (options) {
     this.options = options;
 
-    this.dataAdapter = options.dataAdapter || SelectData;
+    if (options.ajax) {
+      this.dataAdapter = this.dataAdapter || AjaxData;
+    } else if (options.data) {
+      this.dataAdapter = this.dataAdapter || ArrayData;
+    } else {
+      this.dataAdapter = this.dataAdapter || SelectData;
+    }
+
     this.resultsAdapter = ResultsList;
     this.dropdownAdapter = options.dropdownAdapter || Dropdown;
     this.selectionAdapter = options.selectionAdapter;
@@ -10389,3 +10397,30 @@ define('select2/core',[
   return Select2;
 });
 
+define('jquery.select2',[
+  'jquery',
+  'select2/core'
+], function ($, Select2) {
+  if ($.fn.select2 == null) {
+    $.fn.select2 = function (options) {
+      options = options || {};
+
+      if (typeof options === 'object') {
+        this.each(function () {
+          var instance = new Select2($(this), options);
+        });
+      } else if (typeof options === 'string') {
+        var instance = this.data('select2');
+
+        instance[options](arguments.slice(1));
+      } else {
+        throw new Error('Invalid arguments for Select2: ' + options);
+      }
+    };
+  }
+
+  return Select2;
+});
+
+
+require('jquery.select2');

File diff suppressed because it is too large
+ 0 - 0
dist/js/select2.full.min.js


+ 201 - 166
dist/js/select2.js

@@ -1,3 +1,4 @@
+
 /**
  * @license almond 0.2.9 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
@@ -565,166 +566,6 @@ define('select2/utils',[], function () {
   return Utils;
 });
 
-define('select2/data/base',[
-  '../utils'
-], function (Utils) {
-  function BaseAdapter ($element, options) {
-    BaseAdapter.__super__.constructor.call(this);
-  }
-
-  Utils.Extend(BaseAdapter, Utils.Observable);
-
-  BaseAdapter.prototype.current = function (callback) {
-    throw new Error('The `current` method must be defined in child classes.');
-  };
-
-  BaseAdapter.prototype.query = function (params, callback) {
-    throw new Error('The `query` method must be defined in child classes.');
-  };
-
-  return BaseAdapter;
-});
-
-define('select2/data/select',[
-  './base',
-  '../utils',
-  'jquery'
-], function (BaseAdapter, Utils, $) {
-  function SelectAdapter ($element, options) {
-    this.$element = $element;
-
-    SelectAdapter.__super__.constructor.call(this);
-  }
-
-  Utils.Extend(SelectAdapter, BaseAdapter);
-
-  SelectAdapter.prototype.current = function (callback) {
-    var data = [];
-    var self = this;
-
-    this.$element.find(':selected').each(function () {
-      var $option = $(this);
-
-      var option = self.item($option);
-
-      data.push(option);
-    });
-
-    callback(data);
-  };
-
-  SelectAdapter.prototype.select = function (data) {
-    var self = this;
-
-    if (this.$element.prop('multiple')) {
-      this.current(function (currentData) {
-        var val = [];
-
-        data = [data];
-        data.push.apply(data, currentData);
-
-        for (var d = 0; d < data.length; d++) {
-          id = data[d].id;
-
-          if (val.indexOf(id) === -1) {
-            val.push(id);
-          }
-        }
-
-        self.$element.val(val);
-        self.$element.trigger('change');
-      });
-    } else {
-      var val = data.id;
-
-      this.$element.val(val);
-      this.$element.trigger('change');
-    }
-  };
-
-  SelectAdapter.prototype.unselect = function (data) {
-    var self = this;
-
-    if (!this.$element.prop('multiple')) {
-      return;
-    }
-
-    this.current(function (currentData) {
-      var val = [];
-
-      for (var d = 0; d < currentData.length; d++) {
-        id = currentData[d].id;
-
-        if (id !== data.id && val.indexOf(id) === -1) {
-          val.push(id);
-        }
-      }
-
-      self.$element.val(val);
-      self.$element.trigger('change');
-    });
-  };
-
-  SelectAdapter.prototype.bind = function (container, $container) {
-    var self = this;
-
-    container.on('select', function (params) {
-      self.select(params.data);
-    });
-
-    container.on('unselect', function (params) {
-      self.unselect(params.data);
-    });
-  };
-
-  SelectAdapter.prototype.query = function (params, callback) {
-    var data = [];
-    var self = this;
-
-    this.$element.find('option').each(function () {
-      var $option = $(this);
-
-      var option = self.item($option);
-
-      if (self.matches(params, option)) {
-        data.push(option);
-      }
-    });
-
-    callback(data);
-  };
-
-  SelectAdapter.prototype.item = function ($option) {
-    var data = $option.data('data');
-
-    // If the data has already be generated, use it
-    if (data == null) {
-      data = {
-        id: $option.val(),
-        text: $option.html()
-      };
-
-      $option.data('data', data);
-    }
-
-    return data;
-  };
-
-  SelectAdapter.prototype.matches = function (params, data) {
-    if ($.trim(params.term) === '') {
-      return true;
-    }
-
-    if (data.text.indexOf(params.term) > -1) {
-      return true;
-    }
-
-    return false;
-  };
-
-  return SelectAdapter;
-});
-
 define('select2/results',[
   './utils'
 ], function (Utils) {
@@ -779,7 +620,7 @@ define('select2/results',[
         var $option = $(this);
         var item = $option.data('data');
 
-        if (selected.indexOf(item.id) > -1) {
+        if (selected.indexOf(item.id.toString()) > -1) {
           $option.addClass('selected');
         }
       });
@@ -1012,6 +853,166 @@ define('select2/selection/multiple',[
   return MultipleSelection;
 });
 
+define('select2/data/base',[
+  '../utils'
+], function (Utils) {
+  function BaseAdapter ($element, options) {
+    BaseAdapter.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(BaseAdapter, Utils.Observable);
+
+  BaseAdapter.prototype.current = function (callback) {
+    throw new Error('The `current` method must be defined in child classes.');
+  };
+
+  BaseAdapter.prototype.query = function (params, callback) {
+    throw new Error('The `query` method must be defined in child classes.');
+  };
+
+  return BaseAdapter;
+});
+
+define('select2/data/select',[
+  './base',
+  '../utils',
+  'jquery'
+], function (BaseAdapter, Utils, $) {
+  function SelectAdapter ($element, options) {
+    this.$element = $element;
+
+    SelectAdapter.__super__.constructor.call(this);
+  }
+
+  Utils.Extend(SelectAdapter, BaseAdapter);
+
+  SelectAdapter.prototype.current = function (callback) {
+    var data = [];
+    var self = this;
+
+    this.$element.find(':selected').each(function () {
+      var $option = $(this);
+
+      var option = self.item($option);
+
+      data.push(option);
+    });
+
+    callback(data);
+  };
+
+  SelectAdapter.prototype.select = function (data) {
+    var self = this;
+
+    if (this.$element.prop('multiple')) {
+      this.current(function (currentData) {
+        var val = [];
+
+        data = [data];
+        data.push.apply(data, currentData);
+
+        for (var d = 0; d < data.length; d++) {
+          id = data[d].id;
+
+          if (val.indexOf(id) === -1) {
+            val.push(id);
+          }
+        }
+
+        self.$element.val(val);
+        self.$element.trigger('change');
+      });
+    } else {
+      var val = data.id;
+
+      this.$element.val(val);
+      this.$element.trigger('change');
+    }
+  };
+
+  SelectAdapter.prototype.unselect = function (data) {
+    var self = this;
+
+    if (!this.$element.prop('multiple')) {
+      return;
+    }
+
+    this.current(function (currentData) {
+      var val = [];
+
+      for (var d = 0; d < currentData.length; d++) {
+        id = currentData[d].id;
+
+        if (id !== data.id && val.indexOf(id) === -1) {
+          val.push(id);
+        }
+      }
+
+      self.$element.val(val);
+      self.$element.trigger('change');
+    });
+  };
+
+  SelectAdapter.prototype.bind = function (container, $container) {
+    var self = this;
+
+    container.on('select', function (params) {
+      self.select(params.data);
+    });
+
+    container.on('unselect', function (params) {
+      self.unselect(params.data);
+    });
+  };
+
+  SelectAdapter.prototype.query = function (params, callback) {
+    var data = [];
+    var self = this;
+
+    this.$element.find('option').each(function () {
+      var $option = $(this);
+
+      var option = self.item($option);
+
+      if (self.matches(params, option)) {
+        data.push(option);
+      }
+    });
+
+    callback(data);
+  };
+
+  SelectAdapter.prototype.item = function ($option) {
+    var data = $option.data('data');
+
+    // If the data has already be generated, use it
+    if (data == null) {
+      data = {
+        id: $option.val(),
+        text: $option.html()
+      };
+
+      $option.data('data', data);
+    }
+
+    return data;
+  };
+
+  SelectAdapter.prototype.matches = function (params, data) {
+    if ($.trim(params.term) === '') {
+      return true;
+    }
+
+    if (data.text.indexOf(params.term) > -1) {
+      return true;
+    }
+
+    return false;
+  };
+
+  return SelectAdapter;
+});
+
 define('select2/data/array',[
   './select',
   '../utils'
@@ -1031,7 +1032,7 @@ define('select2/data/array',[
       var $option = $(this);
       var option = self.item($option);
 
-      if (option.id == data.id) {
+      if (option.id == data.id.toString()) {
         $option.remove();
       }
     });
@@ -1118,7 +1119,6 @@ define('select2/data/ajax',[
 });
 
 define('select2/options',[
-  './data/select',
   './results',
 
   './dropdown',
@@ -1126,14 +1126,22 @@ define('select2/options',[
   './selection/single',
   './selection/multiple',
 
+  './data/select',
   './data/array',
   './data/ajax'
-], function (SelectData, ResultsList, Dropdown, SingleSelection,
-             MultipleSelection) {
+], function (ResultsList, Dropdown, SingleSelection, MultipleSelection,
+             SelectData, ArrayData, AjaxData) {
   function Options (options) {
     this.options = options;
 
-    this.dataAdapter = options.dataAdapter || SelectData;
+    if (options.ajax) {
+      this.dataAdapter = this.dataAdapter || AjaxData;
+    } else if (options.data) {
+      this.dataAdapter = this.dataAdapter || ArrayData;
+    } else {
+      this.dataAdapter = this.dataAdapter || SelectData;
+    }
+
     this.resultsAdapter = ResultsList;
     this.dropdownAdapter = options.dropdownAdapter || Dropdown;
     this.selectionAdapter = options.selectionAdapter;
@@ -1280,3 +1288,30 @@ define('select2/core',[
   return Select2;
 });
 
+define('jquery.select2',[
+  'jquery',
+  'select2/core'
+], function ($, Select2) {
+  if ($.fn.select2 == null) {
+    $.fn.select2 = function (options) {
+      options = options || {};
+
+      if (typeof options === 'object') {
+        this.each(function () {
+          var instance = new Select2($(this), options);
+        });
+      } else if (typeof options === 'string') {
+        var instance = this.data('select2');
+
+        instance[options](arguments.slice(1));
+      } else {
+        throw new Error('Invalid arguments for Select2: ' + options);
+      }
+    };
+  }
+
+  return Select2;
+});
+
+
+require('jquery.select2');

File diff suppressed because it is too large
+ 0 - 0
dist/js/select2.min.js


+ 2 - 0
docs/_includes/head.html

@@ -8,11 +8,13 @@
 
 <script type="text/javascript" src="dist/js/select2.full.min.js"></script>
 <script type="text/javascript" src="vendor/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="vendor/js/prettify.min.js"></script>
 
 <link href="vendor/css/bootstrap.min.css" type="text/css" rel="stylesheet" />
 <link href="dist/css/select2.min.css" type="text/css" rel="stylesheet" />
 
 <link href="vendor/css/font-awesome.min.css" type="text/css" rel="stylesheet" />
+<link href="vendor/css/prettify.css" type="text/css" rel="stylesheet" />
 
 <style type="text/css">
   .navbar-inverse .navbar-brand { color: #fff; }

+ 185 - 13
docs/examples.html

@@ -4,6 +4,159 @@ title: Examples - Select2
 slug: examples
 ---
 
+<div class="container">
+  <section id="basic" class="row">
+    <div class="col-md-4">
+      <h1>The basics</h1>
+
+      <p>
+        Select2 can take a regular select box like this...
+      </p>
+
+      <p>
+        <select class="js-states form-control"></select>
+      </p>
+
+      <p>
+        and turn it into this...
+      </p>
+
+      <p>
+        <select class="js-example-basic-single js-states form-control"></select>
+      </p>
+    </div>
+    <div class="col-md-8">
+      <h2>Example code</h2>
+
+      <pre class="code" data-fill-from=".js-code-basic"></pre>
+
+<script type="text/x-example-code" class="js-code-basic">
+$(document).ready(function() {
+  $(".js-example-basic-single").select2();
+});
+
+<select class="js-example-basic-single">
+  <option value="AL">Alabama</option>
+    ...
+  <option value="WY">Wyoming</option>
+</select>
+</script>
+    </div>
+  </section>
+
+  <section id="multiple" class="row">
+    <div class="col-md-4">
+      <h1>Multiple select boxes</h1>
+
+      <p>
+        Select2 also supports multi-value select boxes. The select below is declared with the <code>multiple</code> attribute.
+      </p>
+
+      <p>
+        <select class="js-example-basic-multiple js-states form-control" multiple="multiple"></select>
+      </p>
+    </div>
+    <div class="col-md-8">
+      <h2>Example code</h2>
+
+      <pre data-fill-from=".js-code-multiple"></pre>
+
+<script type="text/x-example-code" class="js-code-multiple">
+$(".js-example-basic-multiple").select2();
+</script>
+    </div>
+  </section>
+
+  <section id="placeholders" class="row">
+    <div class="col-md-4">
+      <h1>Placeholders</h1>
+
+      <p>
+        A placeholder value can be defined and will be displayed until a selection is made.
+      </p>
+
+      <p>
+        <select class="js-example-placeholder-single js-states form-control"></select>
+      </p>
+
+      <p>
+        This works for multiple select boxes as well.
+      </p>
+
+      <p>
+        <select class="js-example-placeholder-multiple js-states form-control" multiple="multiple"></select>
+      </p>
+    </div>
+  </section>
+
+  <seection id="data-array" class="row">
+    <div class="col-md-4">
+      <h1>Loading array data</h1>
+
+      <p>
+        Select2 provides a way to load the data from a local array.
+      </p>
+
+      <p>
+        <select class="js-example-data-array form-control"></select>
+      </p>
+
+      <p>
+        You can provide initial selections with array data by providing the
+        option tag for the selected values, similar to how it would be done for
+        a standard select.
+      </p>
+
+      <p>
+        <select class="js-example-data-array-selected form-control">
+          <option value="2" selected="selected">duplicate</option>
+        </select>
+      </p>
+    </div>
+    <div class="col-md-8">
+      <h2>Example code</h2>
+
+      <pre data-fill-from=".js-code-data-array"></pre>
+
+<script type="text/x-example-code" class="js-code-data-array">
+var data = [{ id: 0, text: 'enhancement' }, { id: 1, text: 'bug' }, { id: 2, text: 'duplicate' }, { id: 3, text: 'invalid' }, { id: 4, text: 'wontfix' }];
+
+$(".js-example-data-array").select2({
+  data: data
+})
+
+$(".js-example-data-array-selected").select2({
+  data: data
+})
+
+<select class="js-example-data-array-selected"></select>
+
+<select class="js-example-data-array-selected">
+  <option value="2" selected="selected">duplicate</option>
+</select>
+</script>
+    </div>
+  </section>
+
+  <section id="data-ajax">
+    <h1>Loading remote data</h1>
+
+    <p>
+      Select2 comes with AJAX support built in, using jQuery's AJAX methods.
+    </p>
+
+    <p>
+      <select class="js-example-data-ajax form-control"></select>
+    </p>
+
+    <pre data-fill-from=".js-code-data-ajax"></pre>
+
+<script type="text/x-example-code" class="js-code-data-ajax">
+
+</script>
+  </section>
+</div>
+
 <select class="js-source-states" style="display: none;">
     <option value="AK">Alaska</option>
     <option value="HI">Hawaii</option>
@@ -57,9 +210,6 @@ slug: examples
     <option value="WV">West Virginia</option>
 </select>
 
-<select class="js-example-basic-single js-states"></select>
-<select class="js-example-basic-multiple js-states" multiple="multiple"></select>
-
 <script type="text/javascript">
 
 var $states = $(".js-source-states");
@@ -68,27 +218,49 @@ $states.remove();
 
 $(".js-states").html(statesOptions);
 
+$("[data-fill-from]").each(function () {
+  var $this = $(this);
+
+  var codeContainer = $this.data("fill-from");
+  var $container = $(codeContainer);
+
+  var code = $.trim($container.html());
+
+  $this.text(code);
+  $this.addClass("prettyprint linenums");
+});
+
+prettyPrint();
+
 require(["select2/core", "select2/dropdown", "select2/utils"], function (Select2, Dropdown, Utils) {
     var $basicSingle = $(".js-example-basic-single");
     var $basicMultiple = $(".js-example-basic-multiple");
 
-    //new Select2($basicSingle);
-    new Select2($basicMultiple);
+    var $placeholderSingle = $(".js-example-placeholder-single");
+    var $placeholderMultiple = $(".js-example-placeholder-multiple");
 
-    function AttachToBody () { }
+    var $dataArray = $(".js-example-data-array");
+    var $dataArraySelected = $(".js-example-data-array-selected");
 
-    AttachToBody.prototype.render = function (decorated) {
-        var $dropdown = decorated.call(this);
+    var data = [{ id: 0, text: 'enhancement' }, { id: 1, text: 'bug' }, { id: 2, text: 'duplicate' }, { id: 3, text: 'invalid' }, { id: 4, text: 'wontfix' }];
 
+    $basicSingle.select2();
+    $basicMultiple.select2()
 
+    $placeholderSingle.select2({
+      placeholder: "Select a state"
+    });
 
-        return $dropdown;
-    }
+    $placeholderMultiple.select2({
+      placeholder: "Select a state"
+    });
 
-    var BodyDropdown = Utils.Decorate(Dropdown, AttachToBody);
+    $dataArray.select2({
+      data: data
+    });
 
-    new Select2($basicSingle, {
-        dropdownAdapter: BodyDropdown
+    $dataArraySelected.select2({
+      data: data
     });
 });
 </script>

+ 1 - 1
docs/index.html

@@ -21,7 +21,7 @@ slug: home
           </a>
         </p>
         <p>
-          <strong>Version</strong> 4.0.0
+          <strong>Version</strong> 4.0.0 <em>alpha</em>
         </p>
       </div>
     </div>

+ 30 - 0
docs/vendor/css/prettify.css

@@ -0,0 +1,30 @@
+.com { color: #93a1a1; }
+.lit { color: #195f91; }
+.pun, .opn, .clo { color: #93a1a1; }
+.fun { color: #dc322f; }
+.str, .atv { color: #D14; }
+.kwd, .linenums .tag { color: #1e347b; }
+.typ, .atn, .dec, .var { color: teal; }
+.pln { color: #48484c; }
+
+.prettyprint {
+  padding: 8px;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+}
+.prettyprint.linenums {
+  -webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+     -moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+          box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+}
+
+/* Specify class=linenums on a pre to get line numbering */
+ol.linenums {
+  margin: 0;
+}
+ol.linenums li {
+  padding-left: 12px;
+  color: #bebec5;
+  line-height: 18px;
+  text-shadow: 0 1px 0 #fff;
+}

+ 28 - 0
docs/vendor/js/prettify.min.js

@@ -0,0 +1,28 @@
+var q=null;window.PR_SHOULD_USE_CONTINUATION=!0;
+(function(){function L(a){function m(a){var f=a.charCodeAt(0);if(f!==92)return f;var b=a.charAt(1);return(f=r[b])?f:"0"<=b&&b<="7"?parseInt(a.substring(1),8):b==="u"||b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function e(a){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"||a==="-"||a==="["||a==="]")a="\\"+a;return a}function h(a){for(var f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),a=
+[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c<i;++c){var j=f[c];if(/\\[bdsw]/i.test(j))a.push(j);else{var j=m(j),d;c+2<i&&"-"===f[c+1]?(d=m(f[c+2]),c+=2):d=j;b.push([j,d]);d<65||j>122||(d<65||j>90||b.push([Math.max(65,j)|32,Math.min(d,90)|32]),d<97||j>122||b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return a[0]-f[0]||f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;c<b.length;++c)i=b[c],i[0]<=j[1]+1?j[1]=Math.max(j[1],i[1]):f.push(j=i);b=["["];o&&b.push("^");b.push.apply(b,a);for(c=0;c<
+f.length;++c)i=f[c],b.push(e(i[0])),i[1]>i[0]&&(i[1]+1>i[0]&&b.push("-"),b.push(e(i[1])));b.push("]");return b.join("")}function y(a){for(var f=a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c<b;++c){var j=f[c];j==="("?++i:"\\"===j.charAt(0)&&(j=+j.substring(1))&&j<=i&&(d[j]=-1)}for(c=1;c<d.length;++c)-1===d[c]&&(d[c]=++t);for(i=c=0;c<b;++c)j=f[c],j==="("?(++i,d[i]===void 0&&(f[c]="(?:")):"\\"===j.charAt(0)&&
+(j=+j.substring(1))&&j<=i&&(f[c]="\\"+d[i]);for(i=c=0;c<b;++c)"^"===f[c]&&"^"!==f[c+1]&&(f[c]="");if(a.ignoreCase&&s)for(c=0;c<b;++c)j=f[c],a=j.charAt(0),j.length>=2&&a==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p<d;++p){var g=a[p];if(g.ignoreCase)l=!0;else if(/[a-z]/i.test(g.source.replace(/\\u[\da-f]{4}|\\x[\da-f]{2}|\\[^UXux]/gi,""))){s=!0;l=!1;break}}for(var r=
+{b:8,t:9,n:10,v:11,f:12,r:13},n=[],p=0,d=a.length;p<d;++p){g=a[p];if(g.global||g.multiline)throw Error(""+g);n.push("(?:"+y(g)+")")}return RegExp(n.join("|"),l?"gi":"g")}function M(a){function m(a){switch(a.nodeType){case 1:if(e.test(a.className))break;for(var g=a.firstChild;g;g=g.nextSibling)m(g);g=a.nodeName;if("BR"===g||"LI"===g)h[s]="\n",t[s<<1]=y++,t[s++<<1|1]=a;break;case 3:case 4:g=a.nodeValue,g.length&&(g=p?g.replace(/\r\n?/g,"\n"):g.replace(/[\t\n\r ]+/g," "),h[s]=g,t[s<<1]=y,y+=g.length,
+t[s++<<1|1]=a)}}var e=/(?:^|\s)nocode(?:\s|$)/,h=[],y=0,t=[],s=0,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=document.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);m(a);return{a:h.join("").replace(/\n$/,""),c:t}}function B(a,m,e,h){m&&(a={a:m,d:a},e(a),h.push.apply(h,a.e))}function x(a,m){function e(a){for(var l=a.d,p=[l,"pln"],d=0,g=a.a.match(y)||[],r={},n=0,z=g.length;n<z;++n){var f=g[n],b=r[f],o=void 0,c;if(typeof b===
+"string")c=!1;else{var i=h[f.charAt(0)];if(i)o=f.match(i[1]),b=i[0];else{for(c=0;c<t;++c)if(i=m[c],o=f.match(i[1])){b=i[0];break}o||(b="pln")}if((c=b.length>=5&&"lang-"===b.substring(0,5))&&!(o&&typeof o[1]==="string"))c=!1,b="src";c||(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else p.push(l+i,b)}a.e=p}var h={},y;(function(){for(var e=a.concat(m),
+l=[],p={},d=0,g=e.length;d<g;++d){var r=e[d],n=r[3];if(n)for(var k=n.length;--k>=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)||(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var t=m.length;return e}function u(a){var m=[],e=[];a.tripleQuotedStrings?m.push(["str",/^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/,q,"'\""]):a.multiLineStrings?m.push(["str",/^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/,
+q,"'\"`"]):m.push(["str",/^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,q,"\"'"]);a.verbatimStrings&&e.push(["str",/^@"(?:[^"]|"")*(?:"|$)/,q]);var h=a.hashComments;h&&(a.cStyleComments?(h>1?m.push(["com",/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,q,"#"]):m.push(["com",/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/,q,"#"]),e.push(["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,q])):m.push(["com",/^#[^\n\r]*/,
+q,"#"]));a.cStyleComments&&(e.push(["com",/^\/\/[^\n\r]*/,q]),e.push(["com",/^\/\*[\S\s]*?(?:\*\/|$)/,q]));a.regexLiterals&&e.push(["lang-regex",/^(?:^^\.?|[!+-]|!=|!==|#|%|%=|&|&&|&&=|&=|\(|\*|\*=|\+=|,|-=|->|\/|\/=|:|::|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|[?@[^]|\^=|\^\^|\^\^=|{|\||\|=|\|\||\|\|=|~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\s*(\/(?=[^*/])(?:[^/[\\]|\\[\S\s]|\[(?:[^\\\]]|\\[\S\s])*(?:]|$))+\/)/]);(h=a.types)&&e.push(["typ",h]);a=(""+a.keywords).replace(/^ | $/g,
+"");a.length&&e.push(["kwd",RegExp("^(?:"+a.replace(/[\s,]+/g,"|")+")\\b"),q]);m.push(["pln",/^\s+/,q," \r\n\t\xa0"]);e.push(["lit",/^@[$_a-z][\w$@]*/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]*/i,q],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,q,"0123456789"],["pln",/^\\[\S\s]?/,q],["pun",/^.[^\s\w"-$'./@\\`]*/,q]);return x(m,e)}function D(a,m){function e(a){switch(a.nodeType){case 1:if(k.test(a.className))break;if("BR"===a.nodeName)h(a),
+a.parentNode&&a.parentNode.removeChild(a);else for(a=a.firstChild;a;a=a.nextSibling)e(a);break;case 3:case 4:if(p){var b=a.nodeValue,d=b.match(t);if(d){var c=b.substring(0,d.index);a.nodeValue=c;(b=b.substring(d.index+d[0].length))&&a.parentNode.insertBefore(s.createTextNode(b),a.nextSibling);h(a);c||a.parentNode.removeChild(a)}}}}function h(a){function b(a,d){var e=d?a.cloneNode(!1):a,f=a.parentNode;if(f){var f=b(f,1),g=a.nextSibling;f.appendChild(e);for(var h=g;h;h=g)g=h.nextSibling,f.appendChild(h)}return e}
+for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var a=b(a.nextSibling,0),e;(e=a.parentNode)&&e.nodeType===1;)a=e;d.push(a)}var k=/(?:^|\s)nocode(?:\s|$)/,t=/\r\n?|\n/,s=a.ownerDocument,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=s.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);for(l=s.createElement("LI");a.firstChild;)l.appendChild(a.firstChild);for(var d=[l],g=0;g<d.length;++g)e(d[g]);m===(m|0)&&d[0].setAttribute("value",
+m);var r=s.createElement("OL");r.className="linenums";for(var n=Math.max(0,m-1|0)||0,g=0,z=d.length;g<z;++g)l=d[g],l.className="L"+(g+n)%10,l.firstChild||l.appendChild(s.createTextNode("\xa0")),r.appendChild(l);a.appendChild(r)}function k(a,m){for(var e=m.length;--e>=0;){var h=m[e];A.hasOwnProperty(h)?window.console&&console.warn("cannot override language handler %s",h):A[h]=a}}function C(a,m){if(!a||!A.hasOwnProperty(a))a=/^\s*</.test(m)?"default-markup":"default-code";return A[a]}function E(a){var m=
+a.g;try{var e=M(a.h),h=e.a;a.a=h;a.c=e.c;a.d=0;C(m,h)(a);var k=/\bMSIE\b/.test(navigator.userAgent),m=/\n/g,t=a.a,s=t.length,e=0,l=a.c,p=l.length,h=0,d=a.e,g=d.length,a=0;d[g]=s;var r,n;for(n=r=0;n<g;)d[n]!==d[n+2]?(d[r++]=d[n++],d[r++]=d[n++]):n+=2;g=r;for(n=r=0;n<g;){for(var z=d[n],f=d[n+1],b=n+2;b+2<=g&&d[b+1]===f;)b+=2;d[r++]=z;d[r++]=f;n=b}for(d.length=r;h<p;){var o=l[h+2]||s,c=d[a+2]||s,b=Math.min(o,c),i=l[h+1],j;if(i.nodeType!==1&&(j=t.substring(e,b))){k&&(j=j.replace(m,"\r"));i.nodeValue=
+j;var u=i.ownerDocument,v=u.createElement("SPAN");v.className=d[a+1];var x=i.parentNode;x.replaceChild(v,i);v.appendChild(i);e<o&&(l[h+1]=i=u.createTextNode(t.substring(b,o)),x.insertBefore(i,v.nextSibling))}e=b;e>=o&&(h+=2);e>=c&&(a+=2)}}catch(w){"console"in window&&console.log(w&&w.stack?w.stack:w)}}var v=["break,continue,do,else,for,if,return,while"],w=[[v,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"],
+"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],F=[w,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],G=[w,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"],
+H=[G,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"],w=[w,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],I=[v,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"],
+J=[v,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],v=[v,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],K=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/,N=/\S/,O=u({keywords:[F,H,w,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END"+
+I,J,v],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),A={};k(O,["default-code"]);k(x([],[["pln",/^[^<?]+/],["dec",/^<!\w[^>]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\S\s]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),
+["default-markup","htm","html","mxml","xhtml","xml","xsl"]);k(x([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/],["lang-js",/^on\w+\s*=\s*"([^"]+)"/i],["lang-js",/^on\w+\s*=\s*'([^']+)'/i],["lang-js",/^on\w+\s*=\s*([^\s"'>]+)/i],["lang-css",/^style\s*=\s*"([^"]+)"/i],["lang-css",/^style\s*=\s*'([^']+)'/i],["lang-css",
+/^style\s*=\s*([^\s"'>]+)/i]]),["in.tag"]);k(x([],[["atv",/^[\S\s]+/]]),["uq.val"]);k(u({keywords:F,hashComments:!0,cStyleComments:!0,types:K}),["c","cc","cpp","cxx","cyc","m"]);k(u({keywords:"null,true,false"}),["json"]);k(u({keywords:H,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:K}),["cs"]);k(u({keywords:G,cStyleComments:!0}),["java"]);k(u({keywords:v,hashComments:!0,multiLineStrings:!0}),["bsh","csh","sh"]);k(u({keywords:I,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}),
+["cv","py"]);k(u({keywords:"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["perl","pl","pm"]);k(u({keywords:J,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb"]);k(u({keywords:w,cStyleComments:!0,regexLiterals:!0}),["js"]);k(u({keywords:"all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes",
+hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);k(x([],[["str",/^[\S\s]+/]]),["regex"]);window.prettyPrintOne=function(a,m,e){var h=document.createElement("PRE");h.innerHTML=a;e&&D(h,e);E({g:m,i:e,h:h});return h.innerHTML};window.prettyPrint=function(a){function m(){for(var e=window.PR_SHOULD_USE_CONTINUATION?l.now()+250:Infinity;p<h.length&&l.now()<e;p++){var n=h[p],k=n.className;if(k.indexOf("prettyprint")>=0){var k=k.match(g),f,b;if(b=
+!k){b=n;for(var o=void 0,c=b.firstChild;c;c=c.nextSibling)var i=c.nodeType,o=i===1?o?b:c:i===3?N.test(c.nodeValue)?b:o:o;b=(f=o===b?void 0:o)&&"CODE"===f.tagName}b&&(k=f.className.match(g));k&&(k=k[1]);b=!1;for(o=n.parentNode;o;o=o.parentNode)if((o.tagName==="pre"||o.tagName==="code"||o.tagName==="xmp")&&o.className&&o.className.indexOf("prettyprint")>=0){b=!0;break}b||((b=(b=n.className.match(/\blinenums\b(?::(\d+))?/))?b[1]&&b[1].length?+b[1]:!0:!1)&&D(n,b),d={g:k,h:n,i:b},E(d))}}p<h.length?setTimeout(m,
+250):a&&a()}for(var e=[document.getElementsByTagName("pre"),document.getElementsByTagName("code"),document.getElementsByTagName("xmp")],h=[],k=0;k<e.length;++k)for(var t=0,s=e[k].length;t<s;++t)h.push(e[k][t]);var e=q,l=Date;l.now||(l={now:function(){return+new Date}});var p=0,d,g=/\blang(?:uage)?-([\w.]+)(?!\S)/;m()};window.PR={createSimpleLexer:x,registerLangHandler:k,sourceDecorator:u,PR_ATTRIB_NAME:"atn",PR_ATTRIB_VALUE:"atv",PR_COMMENT:"com",PR_DECLARATION:"dec",PR_KEYWORD:"kwd",PR_LITERAL:"lit",
+PR_NOCODE:"nocode",PR_PLAIN:"pln",PR_PUNCTUATION:"pun",PR_SOURCE:"src",PR_STRING:"str",PR_TAG:"tag",PR_TYPE:"typ"}})();

+ 1 - 0
src/js/end.js

@@ -0,0 +1 @@
+require('jquery.select2');

+ 24 - 0
src/js/jquery.select2.js

@@ -0,0 +1,24 @@
+define([
+  'jquery',
+  'select2/core'
+], function ($, Select2) {
+  if ($.fn.select2 == null) {
+    $.fn.select2 = function (options) {
+      options = options || {};
+
+      if (typeof options === 'object') {
+        this.each(function () {
+          var instance = new Select2($(this), options);
+        });
+      } else if (typeof options === 'string') {
+        var instance = this.data('select2');
+
+        instance[options](arguments.slice(1));
+      } else {
+        throw new Error('Invalid arguments for Select2: ' + options);
+      }
+    };
+  }
+
+  return Select2;
+});

+ 1 - 1
src/js/select2/data/array.js

@@ -17,7 +17,7 @@ define([
       var $option = $(this);
       var option = self.item($option);
 
-      if (option.id == data.id) {
+      if (option.id == data.id.toString()) {
         $option.remove();
       }
     });

+ 11 - 4
src/js/select2/options.js

@@ -1,5 +1,4 @@
 define([
-  './data/select',
   './results',
 
   './dropdown',
@@ -7,14 +6,22 @@ define([
   './selection/single',
   './selection/multiple',
 
+  './data/select',
   './data/array',
   './data/ajax'
-], function (SelectData, ResultsList, Dropdown, SingleSelection,
-             MultipleSelection) {
+], function (ResultsList, Dropdown, SingleSelection, MultipleSelection,
+             SelectData, ArrayData, AjaxData) {
   function Options (options) {
     this.options = options;
 
-    this.dataAdapter = options.dataAdapter || SelectData;
+    if (options.ajax) {
+      this.dataAdapter = this.dataAdapter || AjaxData;
+    } else if (options.data) {
+      this.dataAdapter = this.dataAdapter || ArrayData;
+    } else {
+      this.dataAdapter = this.dataAdapter || SelectData;
+    }
+
     this.resultsAdapter = ResultsList;
     this.dropdownAdapter = options.dropdownAdapter || Dropdown;
     this.selectionAdapter = options.selectionAdapter;

+ 1 - 1
src/js/select2/results.js

@@ -52,7 +52,7 @@ define([
         var $option = $(this);
         var item = $option.data('data');
 
-        if (selected.indexOf(item.id) > -1) {
+        if (selected.indexOf(item.id.toString()) > -1) {
           $option.addClass('selected');
         }
       });

+ 0 - 0
src/js/start.js


Some files were not shown because too many files changed in this diff