Update pages. See main branch for changes

Author: johnny

index.html

@@ -78,13 +78,15 @@ <h1>jQuery Sortable</h1>
       <a class='btn btn-large btn-success' href='js/jquery-sortable.js'>
         <i class='icon-hdd icon-white'></i>
         Download
+        (v0.9)
       </a>
     </p>
     <p>
       <small>
         Download
         <a href='js/jquery-sortable-min.js'>minified</a>
         version
+        (7.0 kb)
       </small>
     </p>
   </div>
@@ -135,6 +137,22 @@ <h3>The opinionated part</h3>
         This way we can cache the item dimensions.
         <small>This might change in the future, if need be.</small>
       </p>
+      <h3>Compatibility</h3>
+      <p>
+        <code>jquery-sortable.js</code>
+        has been tested with the following browsers
+      </p>
+      <ul>
+        <li>Firefox >= 3.5</li>
+        <li>Chrome</li>
+        <li>Konqueror</li>
+        <li>IE > 7</li>
+      </ul>
+      <p>
+        If you confirmed, that it works on other browsers please
+        <a href='mailto:jvadev@gmail.com'>tell me</a>
+        .
+      </p>
     </div>
     <div class='span6'>
       <h3>
@@ -746,7 +764,49 @@ <h3>Sortable column heads</h3>
   <div class='page-header'>
     <h1>Documentation</h1>
   </div>
-  <h2>Group options</h2>
+  <h2>jQuery API</h2>
+  <p>
+    The
+    <code>sortable()</code>
+    method must be invoked on valid containers,
+    meaning they must match the
+    <code>containerSelector</code>
+    option.
+  </p>
+  <div class='row'>
+    <div class='span6'>
+      <h3>
+        <code>.sortable([options])</code>
+      </h3>
+      <p>
+        Instantiate sortable on each matched element.
+        The available options are divided into
+        <a href='#group-options'>group options</a>
+        and
+        <a href='#container-options'>container options</a>
+        .
+      </p>
+      <p>
+        Group options are shared between all member containers and
+        are set on the first instantiation of a member container.
+        Subsequent instantiations of further containers in the same group do not change the group options.
+      </p>
+      <p>
+        Container options can be set seperately for each member of a group.
+      </p>
+    </div>
+    <div class='span6'>
+      <h3>
+        <code>.sortable("enable")</code>
+      </h3>
+      <p>Enable all instantiated sortables in the set of matched elements</p>
+      <h3>
+        <code>.sortable("disable")</code>
+      </h3>
+      <p>Disable all instantiated sortables in the set of matched elements</p>
+    </div>
+  </div>
+  <h2 id='group-options'>Group options</h2>
   <table class='table table-striped table-bordered docs'>
     <thead>
       <tr>
@@ -862,7 +922,7 @@ <h2>Group options</h2>
 </tr>
     </tbody>
   </table>
-  <h2>Container options</h2>
+  <h2 id='container-options'>Container options</h2>
   <table class='table table-striped table-bordered docs'>
     <thead>
       <tr>

js/application.js

@@ -1081,7 +1081,10 @@ colors = jQuery.Color.names = {
   })
 
 }(window.jQuery);
-/**
+/* ===================================================
+ * jquery-sortable.js v0.9
+ * http://johnny.github.com/jquery-sortable/
+ * ===================================================
  *  Copyright (c) 2012 Jonas von Andrian
  *  All rights reserved.
  *
@@ -1105,8 +1108,8 @@ colors = jQuery.Color.names = {
  *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
+ * ========================================================== */
+
 
 !function ( $, window, undefined){
   var pluginName = 'sortable',
@@ -1429,7 +1432,7 @@ colors = jQuery.Color.names = {
 
   Container.prototype = {
     dragInit: function  (e) {
-      if(e.button !== 0 ||
+      if(e.which !== 1 ||
          !this.options.drag ||
          $(e.target).is(this.options.exclude))
         return;
@@ -1567,10 +1570,11 @@ colors = jQuery.Color.names = {
     return this.each(function(){
       var $t = $(this),
       object = $t.data(pluginName)
-      if(!object)
-        $t.data(pluginName, new Container($t, methodOrOptions))
-      else if (API[methodOrOptions])
+      if(object && API[methodOrOptions])
         API[methodOrOptions].apply(object, args)
+      else if(!object && (methodOrOptions === undefined ||
+                          typeof methodOrOptions === "object"))
+        $t.data(pluginName, new Container($t, methodOrOptions))
     });
   };
 
@@ -1702,6 +1706,6 @@ $(function  () {
   $('.show-code').on('click', function  () {
     $(this).closest('.row').children('.example').slideToggle()
   })
-  $('.default').sortable()
+  $('ol.default').sortable()
 })
 ;

js/jquery-sortable-min.js

@@ -1,4 +1,7 @@
-/**
+/* ===================================================
+ * jquery-sortable.js v0.9
+ * http://johnny.github.com/jquery-sortable/
+ * ===================================================
  *  Copyright (c) 2012 Jonas von Andrian
  *  All rights reserved.
  *
@@ -22,8 +25,8 @@
  *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
+ * ========================================================== */
+
 
 !function ( $, window, undefined){
   var pluginName = 'sortable',
@@ -346,7 +349,7 @@
 
   Container.prototype = {
     dragInit: function  (e) {
-      if(e.button !== 0 ||
+      if(e.which !== 1 ||
          !this.options.drag ||
          $(e.target).is(this.options.exclude))
         return;
@@ -484,10 +487,11 @@
     return this.each(function(){
       var $t = $(this),
       object = $t.data(pluginName)
-      if(!object)
-        $t.data(pluginName, new Container($t, methodOrOptions))
-      else if (API[methodOrOptions])
+      if(object && API[methodOrOptions])
         API[methodOrOptions].apply(object, args)
+      else if(!object && (methodOrOptions === undefined ||
+                          typeof methodOrOptions === "object"))
+        $t.data(pluginName, new Container($t, methodOrOptions))
     });
   };