mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-28 08:50:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Woohoo, fix jquery UI

Browse source
This commit is contained in:
Peter Cottle 2020-04-23 09:06:03 -07:00
parent 392805802b
commit d3bc42c936
4 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gulpfile.js
View file

@ -92,7 +92,7 @@ var buildIndex = function(done) {
var getBundle = function() { var getBundle = function() {
return browserify({ return browserify({
entries: [...glob.sync('src/**/*.js'), ...glob.sync('src/**/*.jsx'), 'lib/jquery-ui-1.9.0.custom.min.js'], entries: [...glob.sync('src/**/*.js'), ...glob.sync('src/**/*.jsx')],
debug: true, debug: true,
}) })
.transform(babelify, { presets: ['@babel/preset-react'] }) .transform(babelify, { presets: ['@babel/preset-react'] })

4
package.json
View file

@ -39,7 +39,9 @@
"dependencies": { "dependencies": {
"backbone": "^1.4.0", "backbone": "^1.4.0",
"flux": "^3.1.3", "flux": "^3.1.3",
"jquery": "^1.8.0", "jquery": "^3.4.0",
"jquery-ui": "^1.12.1",
"jquery-ui-sortable-npm": "^1.0.0",
"markdown": "^0.5.0", "markdown": "^0.5.0",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"q": "^1.5.1", "q": "^1.5.1",

7
src/js/views/rebaseView.js
View file

@ -7,6 +7,13 @@ var ModalTerminal = require('../views').ModalTerminal;
var ContainedBase = require('../views').ContainedBase; var ContainedBase = require('../views').ContainedBase;
var ConfirmCancelView = require('../views').ConfirmCancelView; var ConfirmCancelView = require('../views').ConfirmCancelView;
require('jquery-ui/ui/widget');
require('jquery-ui/ui/scroll-parent');
require('jquery-ui/ui/data');
require('jquery-ui/ui/widgets/mouse');
require('jquery-ui/ui/ie');
require('jquery-ui/ui/widgets/sortable');
var InteractiveRebaseView = ContainedBase.extend({ var InteractiveRebaseView = ContainedBase.extend({
tagName: 'div', tagName: 'div',
template: _.template($('#interactive-rebase-template').html()), template: _.template($('#interactive-rebase-template').html()),

18
yarn.lock
View file

@ -2563,10 +2563,20 @@ jasmine@^3.1.0:
glob "^7.1.4" glob "^7.1.4"
jasmine-core "~3.5.0" jasmine-core "~3.5.0"
jquery@^1.8.0: jquery-ui-sortable-npm@^1.0.0:
version "1.12.4" version "1.0.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-1.12.4.tgz#01e1dfba290fe73deba77ceeacb0f9ba2fec9e0c" resolved "https://registry.yarnpkg.com/jquery-ui-sortable-npm/-/jquery-ui-sortable-npm-1.0.0.tgz#5fa27c36b76d1fbd45de9e24a0c940c19ba1f6ce"
integrity sha1-AeHfuikP5z3rp3zurLD5ui/sngw= integrity sha1-X6J8NrdtH71F3p4koMlAwZuh9s4=
jquery-ui@^1.12.1:
version "1.12.1"
resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"
integrity sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE=
jquery@^3.4.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
version "4.0.0" version "4.0.0"