Skip to content

Commit

Permalink
Depdendencies update (ko 3.4.2, reactor 1.4.0, ko-sortable 1.0.0)
Browse files Browse the repository at this point in the history
Support for ko 3.4.2 and ko 3.5.0-beta (both in our code and by upgrading ko-reactor to latest 1.4.0 release).

Update to jquery ui 1.12 includes even if we stick to jquery ui 1.11 for compatibility reasons so we can easily bundle the latest ko-sortable version (that moved to the newest release)

Another attempt to fix #379
  • Loading branch information
bago committed Feb 23, 2018
1 parent d3731f7 commit 16c5952
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 20 deletions.
17 changes: 12 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
},
"browserify-shim": {
"jquery": "global:jQuery",
"jquery-ui/sortable": "global:jQuery.ui.sortable",
"jquery-ui/draggable": "global:jQuery.ui.draggable",
"jquery-ui/spinner": "global:jQuery.ui.spinner",
"jquery-ui/tabs": "global:jQuery.ui.tabs",
"jquery-ui/ui/widgets/sortable": "global:jQuery.ui.sortable",
"jquery-ui/ui/widgets/draggable": "global:jQuery.ui.draggable",
"jquery-ui/ui/widgets/spinner": "global:jQuery.ui.spinner",
"jquery-ui/ui/widgets/tabs": "global:jQuery.ui.tabs",
"knockout": "global:ko",
"knockout-jqueryui": "global:kojqui",
"tinymce": "global:tinymce"
Expand All @@ -48,13 +48,13 @@
"jquery.iframe-transport": "^1.0.0",
"jsep": "^0.3.3",
"juice": "^4.2.2",
"knockout": "3.4.1",
"knockout-jqueryui": "github:gvas/knockout-jqueryui#v2.2.3",
"knockout-sortable": "github:rniemeyer/knockout-sortable#v0.15.0",
"ko-reactor": "github:ZiadJ/knockoutjs-reactor#v1.3.9",
"knockout": "3.4.2",
"knockout-jqueryui": "2.2.3",
"knockout-sortable": "1.0.0",
"ko-reactor": "^1.4.0",
"mensch": "^0.3.3",
"slick": "github:kamicane/slick#v1.12.2",
"tinycolor2": "github:bgrins/TinyColor#1.4.1",
"slick": "1.12.2",
"tinycolor2": "1.4.1",
"tinymce": "^4.7.7",
"toastr": "^2.1.4"
},
Expand Down
4 changes: 2 additions & 2 deletions src/js/bindings/extsortables.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

var $ = require("jquery");
var ko = require("knockout");
var sortable = require("jquery-ui/sortable");
var draggable = require("jquery-ui/draggable");
var sortable = require("jquery-ui/ui/widgets/sortable");
var draggable = require("jquery-ui/ui/widgets/draggable");
var console = require("console");
require("knockout-sortable");

Expand Down
5 changes: 4 additions & 1 deletion src/js/bindings/if-subs.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,11 @@ if (typeof ko.subscription == 'function' && typeof ko.isWritableObservable !== '
} else if (ko.version == "3.4.2") {
beforeSubscriptionProp = 'ua';
afterSubscriptionProp = 'Ka';
} else if (ko.version == "3.5.0-beta") {
beforeSubscriptionProp = 'Pa';
afterSubscriptionProp = 'ab';
}
else throw "Unsupported minimized Knockout version " + ko.version + " (supported DEBUG or minimized 3.2.0 ... 3.4.2)";
else throw "Unsupported minimized Knockout version " + ko.version + " (supported DEBUG or minimized 3.2.0 ... 3.5.0-beta)";

// internally used by ifsubs binding.
// WARNING this break when used with pureComputed or deferredEvaluated
Expand Down
2 changes: 1 addition & 1 deletion src/js/bindings/jqueryui-spinner.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// We wants to use the step but also wants to leave the user the ability to select specific values.

var $ = require('jquery');
var spinner = require("jquery-ui/spinner");
var spinner = require("jquery-ui/ui/widgets/spinner");
var console = require('console');

if (typeof spinner == 'undefined') throw "Cannot find jquery-ui spinner widget dependency!";
Expand Down
2 changes: 1 addition & 1 deletion src/js/bindings/jqueryui-tabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

var $ = require('jquery');
var console = require('console');
var tabs = require("jquery-ui/tabs");
var tabs = require("jquery-ui/ui/widgets/tabs");

if (typeof tabs == 'undefined') throw "Cannot find jquery-ui tabs widget dependency!";

Expand Down

0 comments on commit 16c5952

Please sign in to comment.