Browse Source

Merge pull request #742 from why520crazy/master

new PR for https://github.com/RubaXa/Sortable/pull/741
pull/744/head
Lebedev Konstantin 9 years ago
parent
commit
43d2b4cc95
  1. 2
      CONTRIBUTING.md
  2. 8
      Sortable.js
  3. 60
      knockout-sortable.js

2
CONTRIBUTING.md

@ -3,7 +3,7 @@
### Issue ### Issue
1. Try [dev](https://github.com/RubaXa/Sortable/tree/dev/)-branch, perhaps the problem has been solved; 1. Try [dev](https://github.com/RubaXa/Sortable/tree/dev/)-branch, perhaps the problem has been solved;
2. [Use the search](https://github.com/RubaXa/Sortable/search?q=problem), maybe already have an answer; 2. [Use the search](https://github.com/RubaXa/Sortable/search?type=Issues&q=problem), maybe already have an answer;
3. If not found, create example on [jsbin.com (draft)](http://jsbin.com/zunibaxada/1/edit?html,js,output) and describe the problem. 3. If not found, create example on [jsbin.com (draft)](http://jsbin.com/zunibaxada/1/edit?html,js,output) and describe the problem.
--- ---

8
Sortable.js

@ -24,6 +24,12 @@
})(function () { })(function () {
"use strict"; "use strict";
if (typeof window == "undefined" || typeof window.document == "undefined") {
return function() {
throw new Error( "Sortable.js requires a window with a document" );
}
}
var dragEl, var dragEl,
parentEl, parentEl,
ghostEl, ghostEl,
@ -363,7 +369,7 @@
_this._disableDelayedDrag(); _this._disableDelayedDrag();
// Make the element draggable // Make the element draggable
dragEl.draggable = true; dragEl.draggable = _this.nativeDraggable;
// Chosen item // Chosen item
_toggleClass(dragEl, _this.options.chosenClass, true); _toggleClass(dragEl, _this.options.chosenClass, true);

60
knockout-sortable.js

@ -1,16 +1,54 @@
(function (factory) { (function (factory) {
"use strict"; "use strict";
if (typeof define === "function" && define.amd) { //get ko ref via global or require
// AMD anonymous module var koRef;
define(["knockout", "./Sortable"], factory); if (typeof ko !== 'undefined') {
} else if (typeof require === "function" && typeof exports === "object" && typeof module === "object") { //global ref already defined
// CommonJS module koRef = ko;
var ko = require("knockout"); }
var Sortable = require('./Sortable'); else if (typeof require === 'function' && typeof exports === 'object' && typeof module === 'object') {
factory(ko, Sortable); //commonjs / node.js
} else { koRef = require('knockout');
// No module loader (plain <script> tag) - put directly in global namespace }
factory(window.ko, window.Sortable); //get sortable ref via global or require
var sortableRef;
if (typeof Sortable !== 'undefined') {
//global ref already defined
sortableRef = Sortable;
}
else if (typeof require === 'function' && typeof exports === 'object' && typeof module === 'object') {
//commonjs / node.js
sortableRef = require('sortablejs');
}
//use references if we found them
if (koRef !== undefined && sortableRef !== undefined) {
factory(koRef, sortableRef);
}
//if both references aren't found yet, get via AMD if available
else if (typeof define === 'function' && define.amd){
//we may have a reference to only 1, or none
if (koRef !== undefined && sortableRef === undefined) {
define(['./Sortable'], function(amdSortableRef){ factory(koRef, amdSortableRef); });
}
else if (koRef === undefined && sortableRef !== undefined) {
define(['knockout'], function(amdKnockout){ factory(amdKnockout, sortableRef); });
}
else if (koRef === undefined && sortableRef === undefined) {
define(['knockout', './Sortable'], factory);
}
}
//no more routes to get references
else {
//report specific error
if (koRef !== undefined && sortableRef === undefined) {
throw new Error('knockout-sortable could not get reference to Sortable');
}
else if (koRef === undefined && sortableRef !== undefined) {
throw new Error('knockout-sortable could not get reference to Knockout');
}
else if (koRef === undefined && sortableRef === undefined) {
throw new Error('knockout-sortable could not get reference to Knockout or Sortable');
}
} }
})(function (ko, Sortable) { })(function (ko, Sortable) {
"use strict"; "use strict";

Loading…
Cancel
Save