Browse Source

HUE-8687 [frontend] Drop the use of expose-loader

Johan Ahlen 6 years ago
parent
commit
6ac54c5

+ 3 - 0
desktop/core/src/desktop/js/ext/jquery.dataTables.1.8.2.min.js

@@ -13,6 +13,9 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
  * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
  */
  */
+
+import jQuery from 'jquery';
+
 (function(i,za,p){i.fn.dataTableSettings=[];var D=i.fn.dataTableSettings;i.fn.dataTableExt={};var n=i.fn.dataTableExt;n.sVersion="1.8.2";n.sErrMode="alert";n.iApiIndex=0;n.oApi={};n.afnFiltering=[];n.aoFeatures=[];n.ofnSearch={};n.afnSortData=[];n.oStdClasses={sPagePrevEnabled:"paginate_enabled_previous",sPagePrevDisabled:"paginate_disabled_previous",sPageNextEnabled:"paginate_enabled_next",sPageNextDisabled:"paginate_disabled_next",sPageJUINext:"",sPageJUIPrev:"",sPageButton:"paginate_button",sPageButtonActive:"paginate_active",
 (function(i,za,p){i.fn.dataTableSettings=[];var D=i.fn.dataTableSettings;i.fn.dataTableExt={};var n=i.fn.dataTableExt;n.sVersion="1.8.2";n.sErrMode="alert";n.iApiIndex=0;n.oApi={};n.afnFiltering=[];n.aoFeatures=[];n.ofnSearch={};n.afnSortData=[];n.oStdClasses={sPagePrevEnabled:"paginate_enabled_previous",sPagePrevDisabled:"paginate_disabled_previous",sPageNextEnabled:"paginate_enabled_next",sPageNextDisabled:"paginate_disabled_next",sPageJUINext:"",sPageJUIPrev:"",sPageButton:"paginate_button",sPageButtonActive:"paginate_active",
 sPageButtonStaticDisabled:"paginate_button paginate_button_disabled",sPageFirst:"first",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last",sStripeOdd:"odd",sStripeEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",sSortableDesc:"sorting_desc_disabled",
 sPageButtonStaticDisabled:"paginate_button paginate_button_disabled",sPageFirst:"first",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last",sStripeOdd:"odd",sStripeEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",sSortableDesc:"sorting_desc_disabled",
 sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sSortJUIWrapper:"",sSortIcon:"",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:""};n.oJUIClasses={sPagePrevEnabled:"fg-button ui-button ui-state-default ui-corner-left",
 sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sSortJUIWrapper:"",sSortIcon:"",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:""};n.oJUIClasses={sPagePrevEnabled:"fg-button ui-button ui-state-default ui-corner-left",

+ 2 - 0
desktop/core/src/desktop/js/ext/jquery.total-storage.1.1.3.min.js

@@ -16,6 +16,8 @@
  * @url http://upstatement.com/blog/2012/01/jquery-local-storage-done-right-and-easy/
  * @url http://upstatement.com/blog/2012/01/jquery-local-storage-done-right-and-easy/
  */
  */
 
 
+import jQuery from 'jquery';
+
 !function(t,e){var o,r,n="test"
 !function(t,e){var o,r,n="test"
 if("localStorage"in window)try{r="undefined"==typeof window.localStorage?e:window.localStorage,o="undefined"!=typeof r&&"undefined"!=typeof window.JSON,window.localStorage.setItem(n,"1"),window.localStorage.removeItem(n)}catch(t){o=!1}t.totalStorage=function(e,o,r){return t.totalStorage.impl.init(e,o,r)},t.totalStorage.setItem=function(e,o,r){return t.totalStorage.impl.setItem(e,o,r)},t.totalStorage.getItem=function(e){return t.totalStorage.impl.getItem(e)},t.totalStorage.getAll=function(){return t.totalStorage.impl.getAll()},t.totalStorage.deleteItem=function(e){return t.totalStorage.impl.deleteItem(e)},t.totalStorage.impl={init:function(t,e,o){return"undefined"!=typeof e?this.setItem(t,e,o):this.getItem(t)},setItem:function(e,n,a){if(!o)try{return t.cookie(e,n,a),n}catch(t){console.log("Local Storage not supported by this browser. Install the cookie plugin on your site to take advantage of the same functionality. You can get it at https://github.com/carhartl/jquery-cookie")}var l=JSON.stringify(n)
 if("localStorage"in window)try{r="undefined"==typeof window.localStorage?e:window.localStorage,o="undefined"!=typeof r&&"undefined"!=typeof window.JSON,window.localStorage.setItem(n,"1"),window.localStorage.removeItem(n)}catch(t){o=!1}t.totalStorage=function(e,o,r){return t.totalStorage.impl.init(e,o,r)},t.totalStorage.setItem=function(e,o,r){return t.totalStorage.impl.setItem(e,o,r)},t.totalStorage.getItem=function(e){return t.totalStorage.impl.getItem(e)},t.totalStorage.getAll=function(){return t.totalStorage.impl.getAll()},t.totalStorage.deleteItem=function(e){return t.totalStorage.impl.deleteItem(e)},t.totalStorage.impl={init:function(t,e,o){return"undefined"!=typeof e?this.setItem(t,e,o):this.getItem(t)},setItem:function(e,n,a){if(!o)try{return t.cookie(e,n,a),n}catch(t){console.log("Local Storage not supported by this browser. Install the cookie plugin on your site to take advantage of the same functionality. You can get it at https://github.com/carhartl/jquery-cookie")}var l=JSON.stringify(n)
 return r.setItem(e,l),this.parseResult(l)},getItem:function(e){if(!o)try{return this.parseResult(t.cookie(e))}catch(t){return null}var n=r.getItem(e)
 return r.setItem(e,l),this.parseResult(l)},getItem:function(e){if(!o)try{return this.parseResult(t.cookie(e))}catch(t){return null}var n=r.getItem(e)

+ 194 - 201
desktop/core/src/desktop/js/ext/ko.editable.custom.js

@@ -16,249 +16,242 @@
 
 
 // based on the original https://github.com/brianchance/knockout-x-editable
 // based on the original https://github.com/brianchance/knockout-x-editable
 
 
-(function (factory) {
-  if (typeof define === "function" && define.amd) {
-    // AMD anonymous module
-    define(["knockout", "jquery"], factory);
-  } else {
-    // No module loader (plain <script> tag) - put directly in global namespace
-    factory(window.ko, window.jQuery);
-  }
-})(function (ko, $) {
-  ko.bindingHandlers.editable = {
-    init: function (element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) {
-      var $element = $(element),
-          value = valueAccessor(),
-          allBindings = allBindingsAccessor(),
-          editableOptions = allBindings.editableOptions || {};
+import $ from 'jquery';
+import ko from 'knockout';
 
 
-      editableOptions.value = ko.utils.unwrapObservable(value);
+ko.bindingHandlers.editable = {
+  init: function (element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) {
+    var $element = $(element),
+        value = valueAccessor(),
+        allBindings = allBindingsAccessor(),
+        editableOptions = allBindings.editableOptions || {};
 
 
-      if (!editableOptions.name) {
-        $.each(bindingContext.$data, function (k, v) {
-          if (v == value) {
-            editableOptions.name = k;
-            return false;
-          }
-        });
-      }
+    editableOptions.value = ko.utils.unwrapObservable(value);
 
 
-      //wrap calls to knockout.validation
-      if (!editableOptions.validate && value.isValid) {
-        editableOptions.validate = function (testValue) {
-          //have to set to new value, then call validate, then reset to original value
-          //not pretty, but works
-          var initalValue = value();
-          value(testValue);
-          var res = value.isValid() ? null : ko.utils.unwrapObservable(value.error);
-          value(initalValue);
-          return res;
+    if (!editableOptions.name) {
+      $.each(bindingContext.$data, function (k, v) {
+        if (v == value) {
+          editableOptions.name = k;
+          return false;
         }
         }
+      });
+    }
+
+    //wrap calls to knockout.validation
+    if (!editableOptions.validate && value.isValid) {
+      editableOptions.validate = function (testValue) {
+        //have to set to new value, then call validate, then reset to original value
+        //not pretty, but works
+        var initalValue = value();
+        value(testValue);
+        var res = value.isValid() ? null : ko.utils.unwrapObservable(value.error);
+        value(initalValue);
+        return res;
       }
       }
+    }
 
 
-      if ((editableOptions.type === 'select' || editableOptions.type === 'checklist' || editableOptions.type === 'typeahead') && !editableOptions.source && editableOptions.options) {
-        if (editableOptions.optionsCaption)
-          editableOptions.prepend = editableOptions.optionsCaption;
+    if ((editableOptions.type === 'select' || editableOptions.type === 'checklist' || editableOptions.type === 'typeahead') && !editableOptions.source && editableOptions.options) {
+      if (editableOptions.optionsCaption)
+        editableOptions.prepend = editableOptions.optionsCaption;
 
 
-        //taken directly from ko.bindingHandlers['options']
-        function applyToObject(object, predicate, defaultValue) {
-          var predicateType = typeof predicate;
-          if (predicateType === "function")    // Given a function; run it against the data value
-            return predicate(object);
-          else if (predicateType === "string") // Given a string; treat it as a property name on the data value
-            return object[predicate];
-          else                                // Given no optionsText arg; use the data value itself
-            return defaultValue;
-        }
+      //taken directly from ko.bindingHandlers['options']
+      function applyToObject(object, predicate, defaultValue) {
+        var predicateType = typeof predicate;
+        if (predicateType === "function")    // Given a function; run it against the data value
+          return predicate(object);
+        else if (predicateType === "string") // Given a string; treat it as a property name on the data value
+          return object[predicate];
+        else                                // Given no optionsText arg; use the data value itself
+          return defaultValue;
+      }
 
 
-        editableOptions.source = function () {
-          return ko.utils.arrayMap(editableOptions.options(), function (item) {
-            var optionValue = applyToObject(item, editableOptions.optionsValue, item);
-            var optionText = applyToObject(item, editableOptions.optionsText, optionText);
+      editableOptions.source = function () {
+        return ko.utils.arrayMap(editableOptions.options(), function (item) {
+          var optionValue = applyToObject(item, editableOptions.optionsValue, item);
+          var optionText = applyToObject(item, editableOptions.optionsText, optionText);
 
 
-            return {
-              value: ko.utils.unwrapObservable(optionValue),
-              text: ko.utils.unwrapObservable(optionText)
-            };
+          return {
+            value: ko.utils.unwrapObservable(optionValue),
+            text: ko.utils.unwrapObservable(optionText)
+          };
+        });
+      }
+    }
+
+    if (editableOptions.visible && ko.isObservable(editableOptions.visible)) {
+      editableOptions.toggle = 'manual';
+    }
+
+    var onActionRender = undefined;
+
+    if (editableOptions.inlineEditAction) {
+      onActionRender = function ($container, overflowing) {
+        if (!overflowing) {
+          var $editAction = $('<a href="javascript:void(0);"><i class="fa fa-fw fa-pencil"></i></a>');
+          if (editableOptions.inlineEditAction.editClass) {
+            $editAction.addClass(editableOptions.inlineEditAction.editClass);
+          }
+          $editAction.on('click', function () {
+            $editable.editable('toggle');
           });
           });
+          $editAction.appendTo($container);
         }
         }
       }
       }
+    }
 
 
-      if (editableOptions.visible && ko.isObservable(editableOptions.visible)) {
-        editableOptions.toggle = 'manual';
+    var addPlaceHolder = function ($container) {
+      if (editableOptions.placeholder) {
+        $('<div>').addClass('editable-inline-empty').text(editableOptions.placeholder).click(function () {
+          $editable.editable('toggle');
+        }).appendTo($container);
       }
       }
+    };
 
 
-      var onActionRender = undefined;
-
-      if (editableOptions.inlineEditAction) {
-        onActionRender = function ($container, overflowing) {
-          if (!overflowing) {
-            var $editAction = $('<a href="javascript:void(0);"><i class="fa fa-fw fa-pencil"></i></a>');
-            if (editableOptions.inlineEditAction.editClass) {
-              $editAction.addClass(editableOptions.inlineEditAction.editClass);
-            }
-            $editAction.on('click', function () {
-              $editable.editable('toggle');
-            });
-            $editAction.appendTo($container);
+    var multiLineEllipsisHandler;
+    if (editableOptions.multiLineEllipsis) {
+      editableOptions.display = function (value) {
+        if (!value) {
+          if (multiLineEllipsisHandler) {
+            multiLineEllipsisHandler.pause();
           }
           }
+          var $container = $(this);
+          $container.empty();
+          addPlaceHolder($container);
+          if (onActionRender) {
+            onActionRender($container);
+          }
+          return;
         }
         }
-      }
 
 
-      var addPlaceHolder = function ($container) {
-        if (editableOptions.placeholder) {
-          $('<div>').addClass('editable-inline-empty').text(editableOptions.placeholder).click(function () {
-            $editable.editable('toggle');
-          }).appendTo($container);
+        if (!multiLineEllipsisHandler) {
+          multiLineEllipsisHandler = new MultiLineEllipsisHandler({
+            element: this,
+            text: value,
+            overflowHeight: editableOptions.multiLineEllipsis.overflowHeight,
+            expandable: editableOptions.multiLineEllipsis,
+            expandActionClass: editableOptions.multiLineEllipsis.expandActionClass,
+            linkify: true,
+            onActionRender: onActionRender
+          });
+
+          ko.utils.domNodeDisposal.addDisposeCallback(element, function() {
+            multiLineEllipsisHandler.dispose();
+          });
+        } else {
+          multiLineEllipsisHandler.setText(value);
+          multiLineEllipsisHandler.resume();
         }
         }
+      }
+    } else if (onActionRender) {
+      editableOptions.display = function (value) {
+        var $container = $(this);
+        if (!value) {
+          addPlaceHolder($container);
+        } else {
+          $('<span>').html(value).appendTo($container);
+        }
+        onActionRender($container);
       };
       };
 
 
-      var multiLineEllipsisHandler;
-      if (editableOptions.multiLineEllipsis) {
-        editableOptions.display = function (value) {
-          if (!value) {
-            if (multiLineEllipsisHandler) {
-              multiLineEllipsisHandler.pause();
-            }
-            var $container = $(this);
-            $container.empty();
-            addPlaceHolder($container);
-            if (onActionRender) {
-              onActionRender($container);
-            }
-            return;
-          }
+      onActionRender = function ($container) {
+        var $editAction = $('<a href="javascript:void(0);"><i class="fa fa-fw fa-pencil"></i></a>');
+        if (editableOptions.inlineEditAction.editClass) {
+          $editAction.addClass(editableOptions.inlineEditAction.editClass);
+        }
+        $editAction.appendTo($container);
+      }
+    }
 
 
-          if (!multiLineEllipsisHandler) {
-            multiLineEllipsisHandler = new MultiLineEllipsisHandler({
-              element: this,
-              text: value,
-              overflowHeight: editableOptions.multiLineEllipsis.overflowHeight,
-              expandable: editableOptions.multiLineEllipsis,
-              expandActionClass: editableOptions.multiLineEllipsis.expandActionClass,
-              linkify: true,
-              onActionRender: onActionRender
-            });
+    //create editable
+    var $editable = $element.editable(editableOptions);
 
 
-            ko.utils.domNodeDisposal.addDisposeCallback(element, function() {
-              multiLineEllipsisHandler.dispose();
-            });
-          } else {
-            multiLineEllipsisHandler.setText(value);
-            multiLineEllipsisHandler.resume();
-          }
+    if (editableOptions.multiLineEllipsis) {
+      $editable.off('.multiLine');
+      $editable.on('hidden.multiLine', function () {
+        if (multiLineEllipsisHandler && ko.unwrap(value)) {
+          multiLineEllipsisHandler.resume();
         }
         }
-      } else if (onActionRender) {
-        editableOptions.display = function (value) {
-          var $container = $(this);
-          if (!value) {
-            addPlaceHolder($container);
+      });
+      $editable.on('shown.multiLine', function () {
+        if (multiLineEllipsisHandler) {
+          multiLineEllipsisHandler.pause();
+        }
+      })
+    }
+
+    //update observable on save
+    if (ko.isObservable(value)) {
+      $editable.on('save.ko', function (e, params) {
+        var newValue = params.newValue || '';
+        if (editableOptions.type === 'wysihtml5') {
+          if (editableOptions.skipNewLines) {
+            newValue = newValue.replace(/<br\s*[\/]?>/gi, ' ').replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '');
           } else {
           } else {
-            $('<span>').html(value).appendTo($container);
+            newValue = newValue.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '');
           }
           }
-          onActionRender($container);
-        };
+        } else {
+          newValue = newValue.replace(/<(?:.|\n)*?>/gm, '');
 
 
-        onActionRender = function ($container) {
-          var $editAction = $('<a href="javascript:void(0);"><i class="fa fa-fw fa-pencil"></i></a>');
-          if (editableOptions.inlineEditAction.editClass) {
-            $editAction.addClass(editableOptions.inlineEditAction.editClass);
+          if (editableOptions.type !== 'textarea') {
+            newValue = newValue.replace(/\r?\n|\r/g, ' ');
           }
           }
-          $editAction.appendTo($container);
         }
         }
-      }
-
-      //create editable
-      var $editable = $element.editable(editableOptions);
+        value(newValue);
+      })
+    }
 
 
-      if (editableOptions.multiLineEllipsis) {
-        $editable.off('.multiLine');
-        $editable.on('hidden.multiLine', function () {
-          if (multiLineEllipsisHandler && ko.unwrap(value)) {
-            multiLineEllipsisHandler.resume();
-          }
+    if (editableOptions.toggleElement) {
+      var $clickable = $element.parent().find(editableOptions.toggleElement);
+      if ($element.parents('.show-inactive-on-hover').length > 0) {
+        $clickable = $element.parents('.show-inactive-on-hover').find(editableOptions.toggleElement);
+      }
+      if ($clickable !== null) {
+        $clickable.on('click', function (e) {
+          e.stopPropagation();
+          e.preventDefault();
+          $editable.editable('toggle');
         });
         });
-        $editable.on('shown.multiLine', function () {
-          if (multiLineEllipsisHandler) {
-            multiLineEllipsisHandler.pause();
-          }
-        })
       }
       }
+    }
 
 
-      //update observable on save
-      if (ko.isObservable(value)) {
-        $editable.on('save.ko', function (e, params) {
-          var newValue = params.newValue || '';
-          if (editableOptions.type === 'wysihtml5') {
-            if (editableOptions.skipNewLines) {
-              newValue = newValue.replace(/<br\s*[\/]?>/gi, ' ').replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '');
-            } else {
-              newValue = newValue.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '');
-            }
-          } else {
-            newValue = newValue.replace(/<(?:.|\n)*?>/gm, '');
-
-            if (editableOptions.type !== 'textarea') {
-              newValue = newValue.replace(/\r?\n|\r/g, ' ');
-            }
-          }
-          value(newValue);
-        })
-      }
+    if (editableOptions.save) {
+      $editable.on('save', editableOptions.save.bind(viewModel));
+    }
 
 
-      if (editableOptions.toggleElement) {
-        var $clickable = $element.parent().find(editableOptions.toggleElement);
-        if ($element.parents('.show-inactive-on-hover').length > 0) {
-          $clickable = $element.parents('.show-inactive-on-hover').find(editableOptions.toggleElement);
+    //setup observable to fire only when editable changes, not when options change
+    //http://www.knockmeout.net/2012/06/knockoutjs-performance-gotcha-3-all-bindings.html
+    ko.computed({
+      read: function () {
+        var _allBindings = ko.utils.unwrapObservable(allBindingsAccessor());
+        var _options = _allBindings.editableOptions || {};
+        if (_options.enabled != null && _options.enabled) {
+          $editable.editable('enable');
         }
         }
-        if ($clickable !== null) {
-          $clickable.on('click', function (e) {
-            e.stopPropagation();
-            e.preventDefault();
-            $editable.editable('toggle');
-          });
+        else {
+          $editable.editable('disable');
         }
         }
-      }
+        var val = ko.utils.unwrapObservable(valueAccessor());
+        if (val === null) val = '';
+        $editable.editable('setValue', val, true)
+      },
+      owner: this,
+      disposeWhenNodeIsRemoved: element
+    });
 
 
-      if (editableOptions.save) {
-        $editable.on('save', editableOptions.save.bind(viewModel));
-      }
-
-      //setup observable to fire only when editable changes, not when options change
-      //http://www.knockmeout.net/2012/06/knockoutjs-performance-gotcha-3-all-bindings.html
+    if (editableOptions.visible && ko.isObservable(editableOptions.visible)) {
       ko.computed({
       ko.computed({
         read: function () {
         read: function () {
-          var _allBindings = ko.utils.unwrapObservable(allBindingsAccessor());
-          var _options = _allBindings.editableOptions || {};
-          if (_options.enabled != null && _options.enabled) {
-            $editable.editable('enable');
-          }
-          else {
-            $editable.editable('disable');
-          }
-          var val = ko.utils.unwrapObservable(valueAccessor());
-          if (val === null) val = '';
-          $editable.editable('setValue', val, true)
+          var val = ko.utils.unwrapObservable(editableOptions.visible());
+          if (val)
+            $editable.editable('show');
         },
         },
         owner: this,
         owner: this,
         disposeWhenNodeIsRemoved: element
         disposeWhenNodeIsRemoved: element
       });
       });
 
 
-      if (editableOptions.visible && ko.isObservable(editableOptions.visible)) {
-        ko.computed({
-          read: function () {
-            var val = ko.utils.unwrapObservable(editableOptions.visible());
-            if (val)
-              $editable.editable('show');
-          },
-          owner: this,
-          disposeWhenNodeIsRemoved: element
-        });
-
-        $editable.on('hidden.ko', function (e, params) {
-          editableOptions.visible(false);
-        });
-      }
+      $editable.on('hidden.ko', function (e, params) {
+        editableOptions.visible(false);
+      });
     }
     }
-  };
-});
+  }
+};

+ 3 - 3
desktop/core/src/desktop/js/jquery/jquery.all.js

@@ -14,7 +14,7 @@
 // See the License for the specific language governing permissions and
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // limitations under the License.
 
 
-import 'jquery';
+import $ from 'jquery';
 import 'jquery/jquery.migration';
 import 'jquery/jquery.migration';
 
 
 import 'jquery.cookie';
 import 'jquery.cookie';
@@ -49,5 +49,5 @@ import 'jquery/plugins/jquery.tableextender2';
 import 'jquery/plugins/jquery.tablescroller';
 import 'jquery/plugins/jquery.tablescroller';
 import 'jquery/plugins/jquery.titleupdater';
 import 'jquery/plugins/jquery.titleupdater';
 
 
-// window.$ = $;
-// window.jQuery = $;
+window.$ = $;
+window.jQuery = $;

File diff suppressed because it is too large
+ 0 - 0
desktop/core/src/desktop/static/desktop/js/bundles/hue-bundle-1a4be08a4dac929d7c84.js


File diff suppressed because it is too large
+ 0 - 0
desktop/core/src/desktop/static/desktop/js/bundles/hue-bundle-1a4be08a4dac929d7c84.js.map


File diff suppressed because it is too large
+ 0 - 0
desktop/core/src/desktop/static/desktop/js/bundles/hue-bundle-5a1bf7f66484544c5faf.js.map


+ 1 - 1
desktop/core/src/desktop/static/desktop/js/bundles/sqlSyntaxWebWorker-bundle-5a1bf7f66484544c5faf.js → desktop/core/src/desktop/static/desktop/js/bundles/sqlSyntaxWebWorker-bundle-1a4be08a4dac929d7c84.js

@@ -37,4 +37,4 @@
   !*** multi ./desktop/core/src/desktop/js/sql/sqlSyntaxWebWorker.js ***!
   !*** multi ./desktop/core/src/desktop/js/sql/sqlSyntaxWebWorker.js ***!
   \*********************************************************************/
   \*********************************************************************/
 /*! no static exports found */function(e,t,a){e.exports=a(/*! ./desktop/core/src/desktop/js/sql/sqlSyntaxWebWorker.js */"./desktop/core/src/desktop/js/sql/sqlSyntaxWebWorker.js")}});
 /*! no static exports found */function(e,t,a){e.exports=a(/*! ./desktop/core/src/desktop/js/sql/sqlSyntaxWebWorker.js */"./desktop/core/src/desktop/js/sql/sqlSyntaxWebWorker.js")}});
-//# sourceMappingURL=sqlSyntaxWebWorker-bundle-5a1bf7f66484544c5faf.js.map
+//# sourceMappingURL=sqlSyntaxWebWorker-bundle-1a4be08a4dac929d7c84.js.map

File diff suppressed because it is too large
+ 0 - 0
desktop/core/src/desktop/static/desktop/js/bundles/sqlSyntaxWebWorker-bundle-1a4be08a4dac929d7c84.js.map


+ 1 - 1
webpack-stats.json

@@ -1 +1 @@
-{"status":"done","chunks":{"hue":[{"name":"hue-bundle-5a1bf7f66484544c5faf.js","path":"/Users/jahlen/dev/hue/desktop/core/src/desktop/static/desktop/js/bundles/hue-bundle-5a1bf7f66484544c5faf.js"},{"name":"hue-bundle-5a1bf7f66484544c5faf.js.map","path":"/Users/jahlen/dev/hue/desktop/core/src/desktop/static/desktop/js/bundles/hue-bundle-5a1bf7f66484544c5faf.js.map"}],"sqlSyntaxWebWorker":[{"name":"sqlSyntaxWebWorker-bundle-5a1bf7f66484544c5faf.js","path":"/Users/jahlen/dev/hue/desktop/core/src/desktop/static/desktop/js/bundles/sqlSyntaxWebWorker-bundle-5a1bf7f66484544c5faf.js"},{"name":"sqlSyntaxWebWorker-bundle-5a1bf7f66484544c5faf.js.map","path":"/Users/jahlen/dev/hue/desktop/core/src/desktop/static/desktop/js/bundles/sqlSyntaxWebWorker-bundle-5a1bf7f66484544c5faf.js.map"}]}}
+{"status":"done","chunks":{"hue":[{"name":"hue-bundle-1a4be08a4dac929d7c84.js","path":"/Users/jahlen/dev/hue/desktop/core/src/desktop/static/desktop/js/bundles/hue-bundle-1a4be08a4dac929d7c84.js"},{"name":"hue-bundle-1a4be08a4dac929d7c84.js.map","path":"/Users/jahlen/dev/hue/desktop/core/src/desktop/static/desktop/js/bundles/hue-bundle-1a4be08a4dac929d7c84.js.map"}],"sqlSyntaxWebWorker":[{"name":"sqlSyntaxWebWorker-bundle-1a4be08a4dac929d7c84.js","path":"/Users/jahlen/dev/hue/desktop/core/src/desktop/static/desktop/js/bundles/sqlSyntaxWebWorker-bundle-1a4be08a4dac929d7c84.js"},{"name":"sqlSyntaxWebWorker-bundle-1a4be08a4dac929d7c84.js.map","path":"/Users/jahlen/dev/hue/desktop/core/src/desktop/static/desktop/js/bundles/sqlSyntaxWebWorker-bundle-1a4be08a4dac929d7c84.js.map"}]}}

+ 0 - 8
webpack.config.js

@@ -41,14 +41,6 @@ module.exports = {
         exclude: /node_modules/,
         exclude: /node_modules/,
         loader: 'babel-loader'
         loader: 'babel-loader'
       },
       },
-      { test: /lodash$/, loader: 'expose-loader?_' },
-      {
-        test: /jquery.js$/,
-        loader: [
-          'expose-loader?$',
-          'expose-loader?jQuery'
-        ]
-      },
       { include: /\.json$/, loaders: ['json-loader'] }
       { include: /\.json$/, loaders: ['json-loader'] }
     ]
     ]
   },
   },

Some files were not shown because too many files changed in this diff