Skip to content

Commit 7109f74

Browse files
committed
reverted to compiling our jquery
as I can't get apps or libs (TS in my case) to include jq and compile... #1420
1 parent 7f6402d commit 7109f74

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/jq/gridstack-dd-jqueryui.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ import { GridItemHTMLElement, DDDragInOpt } from '../types';
1313
// export jq symbols see
1414
// https://stackoverflow.com/questions/35345760/importing-jqueryui-with-typescript-and-requirejs
1515
// https://stackoverflow.com/questions/33998262/jquery-ui-and-webpack-how-to-manage-it-into-module
16-
import * as $ from 'jquery';
16+
// TODO: let user bring their own jq or jq-ui version
17+
import * as $ from './jquery'; // compile this in... having issues TS/ES6 app would include instead
1718
export { $ };
18-
import 'jquery-ui';
19+
import './jquery-ui';
1920

2021
/**
2122
* legacy Jquery-ui based drag'n'drop plugin.

src/jq/jquery-ui.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
*/
66

77
(function( factory ) {
8+
/* [alain] we compile this in so no need to load with AMD
89
if ( typeof define === "function" && define.amd ) {
910
1011
// AMD. Register as an anonymous module.
1112
define([ "jquery" ], factory );
12-
} else {
13+
} else */ {
1314

1415
// Browser globals
1516
factory( jQuery );

0 commit comments

Comments
 (0)