Selaa lähdekoodia

HUE-5048 [frontend] Remove RequireJS from home and wizards

Johan Ahlen 9 vuotta sitten
vanhempi
commit
a6bdead17c

+ 21 - 23
apps/beeswax/src/beeswax/templates/create_database.mako

@@ -22,16 +22,28 @@ from django.utils.translation import ugettext as _
 <%namespace name="assist" file="/assist.mako" />
 <%namespace name="comps" file="beeswax_components.mako" />
 <%namespace name="layout" file="layout.mako" />
-<%namespace name="require" file="/require.mako" />
 
 ${ commonheader(_("Create database"), 'metastore', user) | n,unicode }
 ${layout.metastore_menubar()}
 
-${ require.config() }
-
-${ assist.assistPanel() }
-
+<script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
+<script src="${ static('desktop/js/jquery.huedatatable.js') }"></script>
 <script src="${ static('desktop/ext/js/d3.v3.js') }" type="text/javascript" charset="utf-8"></script>
+<script src="${ static('desktop/ext/js/routie-0.3.0.min.js') }" type="text/javascript" charset="utf-8"></script>
+<script src="${ static('desktop/ext/js/knockout.min.js') }"></script>
+<script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
+<script src="${ static('desktop/js/apiHelper.js') }"></script>
+<script src="${ static('metastore/js/metastore.ko.js') }"></script>
+<script src="${ static('desktop/js/ko.charts.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-mapping.min.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>
+<script src="${ static('desktop/js/ko.editable.js') }"></script>
+<script src="${ static('desktop/js/ko.hue-bindings.js') }"></script>
+<script src="${ static('desktop/js/assist/assistDbEntry.js') }"></script>
+<script src="${ static('desktop/js/assist/assistDbSource.js') }"></script>
+<script src="${ static('desktop/js/assist/assistHdfsEntry.js') }"></script>
+<script src="${ static('desktop/js/fileBrowser/hueDocument.js') }"></script>
+<script src="${ static('desktop/js/fileBrowser/hueFileEntry.js') }"></script>
 
 <link rel="stylesheet" href="${ static('metastore/css/metastore.css') }" type="text/css">
 <link rel="stylesheet" href="${ static('notebook/css/notebook.css') }">
@@ -46,6 +58,8 @@ ${ assist.assistPanel() }
 % endif
 </style>
 
+${ assist.assistPanel() }
+
 <a title="${_('Toggle Assist')}" class="pointer show-assist" data-bind="visible: !$root.isLeftPanelVisible() && $root.assistAvailable(), click: function() { $root.isLeftPanelVisible(true); }">
   <i class="fa fa-chevron-right"></i>
 </a>
@@ -227,21 +241,9 @@ ${ assist.assistPanel() }
 
 </div>
 
-
-<script src="${ static('desktop/ext/js/routie-0.3.0.min.js') }" type="text/javascript" charset="utf-8"></script>
-
 <script type="text/javascript" charset="utf-8">
 
-  require([
-    "knockout",
-    "ko.charts",
-    "desktop/js/apiHelper",
-    "assistPanel",
-    "knockout-mapping",
-    "knockout-sortable",
-    "ko.editable",
-    "ko.hue-bindings"
-  ], function (ko, charts, ApiHelper) {
+  (function () {
 
     ko.options.deferUpdates = true;
 
@@ -390,12 +392,8 @@ ${ assist.assistPanel() }
           field.nextAll(".error-inline").addClass("hide");
         }
       }
-
-
     });
-
-  });
-
+  })();
 </script>
 
 ${ commonfooter(request, messages) | n,unicode }

+ 20 - 19
apps/beeswax/src/beeswax/templates/create_table_manually.mako

@@ -22,16 +22,27 @@ from django.utils.translation import ugettext as _
 <%namespace name="assist" file="/assist.mako" />
 <%namespace name="comps" file="beeswax_components.mako" />
 <%namespace name="layout" file="layout.mako" />
-<%namespace name="require" file="/require.mako" />
 
 ${ commonheader(_("Create table manually"), 'metastore', user) | n,unicode }
 ${ layout.metastore_menubar() }
 
-${ require.config() }
-
-${ assist.assistPanel() }
-
+<script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
+<script src="${ static('desktop/js/jquery.huedatatable.js') }"></script>
 <script src="${ static('desktop/ext/js/d3.v3.js') }" type="text/javascript" charset="utf-8"></script>
+<script src="${ static('desktop/ext/js/knockout.min.js') }"></script>
+<script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
+<script src="${ static('desktop/js/apiHelper.js') }"></script>
+<script src="${ static('metastore/js/metastore.ko.js') }"></script>
+<script src="${ static('desktop/js/ko.charts.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-mapping.min.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>
+<script src="${ static('desktop/js/ko.editable.js') }"></script>
+<script src="${ static('desktop/js/ko.hue-bindings.js') }"></script>
+<script src="${ static('desktop/js/assist/assistDbEntry.js') }"></script>
+<script src="${ static('desktop/js/assist/assistDbSource.js') }"></script>
+<script src="${ static('desktop/js/assist/assistHdfsEntry.js') }"></script>
+<script src="${ static('desktop/js/fileBrowser/hueDocument.js') }"></script>
+<script src="${ static('desktop/js/fileBrowser/hueFileEntry.js') }"></script>
 
 <link rel="stylesheet" href="${ static('metastore/css/metastore.css') }">
 <link rel="stylesheet" href="${ static('notebook/css/notebook.css') }">
@@ -46,6 +57,8 @@ ${ assist.assistPanel() }
 % endif
 </style>
 
+${ assist.assistPanel() }
+
 <a title="${_('Toggle Assist')}" class="pointer show-assist" data-bind="visible: !$root.isLeftPanelVisible() && $root.assistAvailable(), click: function() { $root.isLeftPanelVisible(true); }">
   <i class="fa fa-chevron-right"></i>
 </a>
@@ -554,18 +567,7 @@ ${ assist.assistPanel() }
 
 
 <script type="text/javascript" charset="utf-8">
-
-  require([
-    "knockout",
-    "ko.charts",
-    "desktop/js/apiHelper",
-    "assistPanel",
-    "knockout-mapping",
-    "knockout-sortable",
-    "ko.editable",
-    "ko.hue-bindings"
-  ], function (ko, charts, ApiHelper) {
-
+  (function () {
     ko.options.deferUpdates = true;
 
     function MetastoreViewModel(options) {
@@ -913,8 +915,7 @@ ${ assist.assistPanel() }
         }
       }
     });
-  });
-
+  })();
 </script>
 
 ${ commonfooter(request, messages) | n,unicode }

+ 19 - 20
apps/beeswax/src/beeswax/templates/import_wizard_choose_delimiter.mako

@@ -22,17 +22,28 @@ from django.utils.translation import ugettext as _
 <%namespace name="assist" file="/assist.mako" />
 <%namespace name="comps" file="beeswax_components.mako" />
 <%namespace name="layout" file="layout.mako" />
-<%namespace name="require" file="/require.mako" />
 <%namespace name="util" file="util.mako" />
 
 ${ commonheader(_('Create table from file'), 'metastore', user) | n,unicode }
 ${ layout.metastore_menubar() }
 
-${ require.config() }
-
-${ assist.assistPanel() }
-
+<script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
+<script src="${ static('desktop/js/jquery.huedatatable.js') }"></script>
 <script src="${ static('desktop/ext/js/d3.v3.js') }" type="text/javascript" charset="utf-8"></script>
+<script src="${ static('desktop/ext/js/knockout.min.js') }"></script>
+<script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
+<script src="${ static('desktop/js/apiHelper.js') }"></script>
+<script src="${ static('metastore/js/metastore.ko.js') }"></script>
+<script src="${ static('desktop/js/ko.charts.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-mapping.min.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>
+<script src="${ static('desktop/js/ko.editable.js') }"></script>
+<script src="${ static('desktop/js/ko.hue-bindings.js') }"></script>
+<script src="${ static('desktop/js/assist/assistDbEntry.js') }"></script>
+<script src="${ static('desktop/js/assist/assistDbSource.js') }"></script>
+<script src="${ static('desktop/js/assist/assistHdfsEntry.js') }"></script>
+<script src="${ static('desktop/js/fileBrowser/hueDocument.js') }"></script>
+<script src="${ static('desktop/js/fileBrowser/hueFileEntry.js') }"></script>
 
 <link rel="stylesheet" href="${ static('metastore/css/metastore.css') }" type="text/css">
 <link rel="stylesheet" href="${ static('notebook/css/notebook.css') }">
@@ -47,6 +58,7 @@ ${ assist.assistPanel() }
 % endif
 </style>
 
+${ assist.assistPanel() }
 
 <a title="${_('Toggle Assist')}" class="pointer show-assist" data-bind="visible: !$root.isLeftPanelVisible() && $root.assistAvailable(), click: function() { $root.isLeftPanelVisible(true); }">
   <i class="fa fa-chevron-right"></i>
@@ -183,18 +195,7 @@ ${ assist.assistPanel() }
 </style>
 
 <script type="text/javascript" charset="utf-8">
-
-  require([
-    "knockout",
-    "ko.charts",
-    "desktop/js/apiHelper",
-    "assistPanel",
-    "knockout-mapping",
-    "knockout-sortable",
-    "ko.editable",
-    "ko.hue-bindings"
-  ], function (ko, charts, ApiHelper) {
-
+  (function () {
     ko.options.deferUpdates = true;
 
     function MetastoreViewModel(options) {
@@ -264,10 +265,8 @@ ${ assist.assistPanel() }
           $("input[name='submit_delim']").click();
         }
       });
-
     });
-  });
-
+  })();
 </script>
 
 

+ 19 - 20
apps/beeswax/src/beeswax/templates/import_wizard_choose_file.mako

@@ -22,16 +22,27 @@ from django.utils.translation import ugettext as _
 <%namespace name="assist" file="/assist.mako" />
 <%namespace name="comps" file="beeswax_components.mako" />
 <%namespace name="layout" file="layout.mako" />
-<%namespace name="require" file="/require.mako" />
 
 ${ commonheader(_('Create table from file'), 'metastore', user) | n,unicode }
 ${ layout.metastore_menubar() }
 
-${ require.config() }
-
-${ assist.assistPanel() }
-
+<script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
+<script src="${ static('desktop/js/jquery.huedatatable.js') }"></script>
 <script src="${ static('desktop/ext/js/d3.v3.js') }" type="text/javascript" charset="utf-8"></script>
+<script src="${ static('desktop/ext/js/knockout.min.js') }"></script>
+<script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
+<script src="${ static('desktop/js/apiHelper.js') }"></script>
+<script src="${ static('metastore/js/metastore.ko.js') }"></script>
+<script src="${ static('desktop/js/ko.charts.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-mapping.min.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>
+<script src="${ static('desktop/js/ko.editable.js') }"></script>
+<script src="${ static('desktop/js/ko.hue-bindings.js') }"></script>
+<script src="${ static('desktop/js/assist/assistDbEntry.js') }"></script>
+<script src="${ static('desktop/js/assist/assistDbSource.js') }"></script>
+<script src="${ static('desktop/js/assist/assistHdfsEntry.js') }"></script>
+<script src="${ static('desktop/js/fileBrowser/hueDocument.js') }"></script>
+<script src="${ static('desktop/js/fileBrowser/hueFileEntry.js') }"></script>
 
 <link rel="stylesheet" href="${ static('metastore/css/metastore.css') }" type="text/css">
 <link rel="stylesheet" href="${ static('notebook/css/notebook.css') }">
@@ -46,12 +57,12 @@ ${ assist.assistPanel() }
 % endif
 </style>
 
+${ assist.assistPanel() }
 
 <a title="${_('Toggle Assist')}" class="pointer show-assist" data-bind="visible: !$root.isLeftPanelVisible() && $root.assistAvailable(), click: function() { $root.isLeftPanelVisible(true); }">
   <i class="fa fa-chevron-right"></i>
 </a>
 
-
 <div class="main-content">
   <div class="vertical-full container-fluid" data-bind="style: { 'padding-left' : $root.isLeftPanelVisible() ? '0' : '20px' }">
     <div class="vertical-full">
@@ -205,18 +216,7 @@ ${ assist.assistPanel() }
 </style>
 
 <script type="text/javascript" charset="utf-8">
-
-  require([
-    "knockout",
-    "ko.charts",
-    "desktop/js/apiHelper",
-    "assistPanel",
-    "knockout-mapping",
-    "knockout-sortable",
-    "ko.editable",
-    "ko.hue-bindings"
-  ], function (ko, charts, ApiHelper) {
-
+  (function () {
     ko.options.deferUpdates = true;
 
     function MetastoreViewModel(options) {
@@ -302,9 +302,8 @@ ${ assist.assistPanel() }
           $("input[name='submit_file']").click();
         }
       });
-
     });
-  });
+  })();
 </script>
 
 ${ commonfooter(request, messages) | n,unicode }

+ 20 - 24
apps/beeswax/src/beeswax/templates/import_wizard_define_columns.mako

@@ -22,19 +22,28 @@ from django.utils.translation import ugettext as _
 <%namespace name="assist" file="/assist.mako" />
 <%namespace name="comps" file="beeswax_components.mako" />
 <%namespace name="layout" file="layout.mako" />
-<%namespace name="require" file="/require.mako" />
 <%namespace name="util" file="util.mako" />
 
-
 ${ commonheader(_('Create table from file'), 'metastore', user) | n,unicode }
 ${ layout.metastore_menubar() }
 
-${ require.config() }
-
-${ assist.assistPanel() }
-
-
+<script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
+<script src="${ static('desktop/js/jquery.huedatatable.js') }"></script>
 <script src="${ static('desktop/ext/js/d3.v3.js') }" type="text/javascript" charset="utf-8"></script>
+<script src="${ static('desktop/ext/js/knockout.min.js') }"></script>
+<script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
+<script src="${ static('desktop/js/apiHelper.js') }"></script>
+<script src="${ static('metastore/js/metastore.ko.js') }"></script>
+<script src="${ static('desktop/js/ko.charts.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-mapping.min.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>
+<script src="${ static('desktop/js/ko.editable.js') }"></script>
+<script src="${ static('desktop/js/ko.hue-bindings.js') }"></script>
+<script src="${ static('desktop/js/assist/assistDbEntry.js') }"></script>
+<script src="${ static('desktop/js/assist/assistDbSource.js') }"></script>
+<script src="${ static('desktop/js/assist/assistHdfsEntry.js') }"></script>
+<script src="${ static('desktop/js/fileBrowser/hueDocument.js') }"></script>
+<script src="${ static('desktop/js/fileBrowser/hueFileEntry.js') }"></script>
 
 <link rel="stylesheet" href="${ static('metastore/css/metastore.css') }" type="text/css">
 <link rel="stylesheet" href="${ static('notebook/css/notebook.css') }">
@@ -49,6 +58,8 @@ ${ assist.assistPanel() }
 % endif
 </style>
 
+${ assist.assistPanel() }
+
 <a title="${_('Toggle Assist')}" class="pointer show-assist" data-bind="visible: !$root.isLeftPanelVisible() && $root.assistAvailable(), click: function() { $root.isLeftPanelVisible(true); }">
   <i class="fa fa-chevron-right"></i>
 </a>
@@ -219,18 +230,7 @@ ${ assist.assistPanel() }
 </style>
 
 <script type="text/javascript" charset="utf-8">
-
-  require([
-    "knockout",
-    "ko.charts",
-    "desktop/js/apiHelper",
-    "assistPanel",
-    "knockout-mapping",
-    "knockout-sortable",
-    "ko.editable",
-    "ko.hue-bindings"
-  ], function (ko, charts, ApiHelper) {
-
+  (function () {
     ko.options.deferUpdates = true;
 
     function MetastoreViewModel(options) {
@@ -475,12 +475,8 @@ ${ assist.assistPanel() }
       function isInt(n) {
         return Math.floor(n) == n && n.toString().indexOf(".") == -1;
       }
-
-
     });
-  });
-
+  })();
 </script>
 
-
 ${ commonfooter(request, messages) | n,unicode }

+ 12 - 18
apps/jobbrowser/src/jobbrowser/templates/apps.mako

@@ -18,12 +18,16 @@
   from django.utils.translation import ugettext as _
 %>
 
-<%namespace name="require" file="/require.mako" />
-
 ${ commonheader("Job Browser", "jobbrowser", user) | n,unicode }
 
-${ require.config() }
-
+<script src="${ static('desktop/ext/js/knockout.min.js') }"></script>
+<script src="${ static('desktop/js/apiHelper.js') }"></script>
+<script src="${ static('metastore/js/metastore.ko.js') }"></script>
+<script src="${ static('desktop/js/ko.charts.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-mapping.min.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>
+<script src="${ static('desktop/js/ko.editable.js') }"></script>
+<script src="${ static('desktop/js/ko.hue-bindings.js') }"></script>
 
 <div class="navbar navbar-inverse navbar-fixed-top nokids">
     <div class="navbar-inner">
@@ -226,17 +230,7 @@ ${ require.config() }
 
 
 <script type="text/javascript" charset="utf-8">
-  require([
-    "knockout",
-    "ko.charts",
-    "desktop/js/apiHelper",
-    "notebook/js/notebook.ko",
-    "knockout-mapping",
-    "knockout-sortable",
-    "ko.editable",
-    "ko.hue-bindings"
-  ], function (ko, charts, ApiHelper, EditorViewModel) {
-
+  (function () {
     var Job = function (vm, job) {
       var self = this;
 
@@ -303,7 +297,7 @@ ${ require.config() }
           self.loadingJobs(false);
         });
       };
-    }
+    };
 
     var JobBrowserViewModel = function (options) {
       var self = this;
@@ -326,13 +320,13 @@ ${ require.config() }
         i18n: {
           errorLoadingDatabases: "${ _('There was a problem loading the databases') }",
         }
-      }
+      };
       viewModel = new JobBrowserViewModel(options);
       ko.applyBindings(viewModel);
 
       viewModel.jobs.fetchJobs();
     });
-  });
+  })();
 </script>
 
 ${ commonfooter(request, messages) | n,unicode }

+ 20 - 20
apps/metastore/src/metastore/templates/describe_partitions.mako

@@ -21,16 +21,27 @@
 
 <%namespace name="assist" file="/assist.mako" />
 <%namespace name="components" file="components.mako" />
-<%namespace name="require" file="/require.mako" />
 
 ${ commonheader(_('Table Partitions: %(tableName)s') % dict(tableName=table.name), app_name, user) | n,unicode }
 ${ components.menubar() }
 
-${ require.config() }
-
-${ assist.assistPanel() }
-
+<script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
+<script src="${ static('desktop/js/jquery.huedatatable.js') }"></script>
 <script src="${ static('desktop/ext/js/d3.v3.js') }" type="text/javascript" charset="utf-8"></script>
+<script src="${ static('desktop/ext/js/knockout.min.js') }"></script>
+<script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
+<script src="${ static('desktop/js/apiHelper.js') }"></script>
+<script src="${ static('metastore/js/metastore.ko.js') }"></script>
+<script src="${ static('desktop/js/ko.charts.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-mapping.min.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>
+<script src="${ static('desktop/js/ko.editable.js') }"></script>
+<script src="${ static('desktop/js/ko.hue-bindings.js') }"></script>
+<script src="${ static('desktop/js/assist/assistDbEntry.js') }"></script>
+<script src="${ static('desktop/js/assist/assistDbSource.js') }"></script>
+<script src="${ static('desktop/js/assist/assistHdfsEntry.js') }"></script>
+<script src="${ static('desktop/js/fileBrowser/hueDocument.js') }"></script>
+<script src="${ static('desktop/js/fileBrowser/hueFileEntry.js') }"></script>
 
 <link rel="stylesheet" href="${ static('metastore/css/metastore.css') }" type="text/css">
 <link rel="stylesheet" href="${ static('notebook/css/notebook.css') }">
@@ -45,6 +56,8 @@ ${ assist.assistPanel() }
 % endif
 </style>
 
+${ assist.assistPanel() }
+
 <a title="${_('Toggle Assist')}" class="pointer show-assist" data-bind="visible: !$root.isLeftPanelVisible() && $root.assistAvailable(), click: function() { $root.isLeftPanelVisible(true); }">
   <i class="fa fa-chevron-right"></i>
 </a>
@@ -169,18 +182,7 @@ ${ assist.assistPanel() }
 
 
 <script type="text/javascript" charset="utf-8">
-
-  require([
-    "knockout",
-    "ko.charts",
-    "desktop/js/apiHelper",
-    "assistPanel",
-    "knockout-mapping",
-    "knockout-sortable",
-    "ko.editable",
-    "ko.hue-bindings"
-  ], function (ko, charts, ApiHelper) {
-
+  (function () {
     ko.options.deferUpdates = true;
 
     function PartitionViewModel(options, partition_keys_json, partition_values_json) {
@@ -321,10 +323,8 @@ ${ assist.assistPanel() }
         viewModel.chosenPartitions(_tempList);
         $("#dropPartition").modal("show");
       });
-
     });
-  });
-
+  })();
 </script>
 
 ${ commonfooter(request, messages) | n,unicode }

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 151 - 166
apps/oozie/src/oozie/static/oozie/js/coordinator-editor.ko.js


+ 2 - 12
apps/oozie/src/oozie/static/oozie/js/list-oozie-coordinator.ko.js

@@ -14,17 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-(function (root, factory) {
-  if (typeof define === "function" && define.amd) {
-    define([
-      'knockout',
-      'knockout-mapping',
-      'ko.charts'
-    ], factory);
-  } else {
-    root.RunningCoordinatorModel = factory(ko);
-  }
-}(this, function (ko) {
+var RunningCoordinatorModel = (function () {
 
   var RunningCoordinatorModel = function (actions) {
 
@@ -204,4 +194,4 @@
   };
 
   return RunningCoordinatorModel;
-}));
+})();

+ 14 - 14
apps/useradmin/src/useradmin/templates/list_configurations.mako

@@ -24,11 +24,19 @@ from django.contrib.auth.models import Group
 <%namespace name="actionbar" file="actionbar.mako" />
 <%namespace name="configKoComponents" file="/config_ko_components.mako" />
 <%namespace name="layout" file="layout.mako" />
-<%namespace name="require" file="/require.mako" />
 
 ${commonheader(_('Configurations'), "useradmin", user) | n,unicode}
 ${layout.menubar(section='configurations')}
 
+<script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout.min.js') }"></script>
+<script src="${ static('desktop/js/apiHelper.js') }"></script>
+<script src="${ static('metastore/js/metastore.ko.js') }"></script>
+<script src="${ static('desktop/js/ko.charts.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-mapping.min.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>
+<script src="${ static('desktop/js/ko.editable.js') }"></script>
+<script src="${ static('desktop/js/ko.hue-bindings.js') }"></script>
 
 <script id="app-list" type="text/html">
   <div class="card card-small">
@@ -119,18 +127,10 @@ ${layout.menubar(section='configurations')}
   <!-- ko template: { if: !loading() && !hasErrors() && selectedApp(), name: 'edit-app' } --><!-- /ko -->
 </div>
 
-${ require.config() }
 ${ configKoComponents.config() }
 
 <script type="text/javascript" charset="utf-8">
-  require([
-    'knockout',
-    'desktop/js/apiHelper',
-    'knockout-mapping',
-    'ko.hue-bindings',
-    'knockout-sortable'
-  ], function (ko, apiHelper) {
-
+  (function () {
     var GroupOverride = function (group, allGroups) {
       var self = this;
       self.allGroups = allGroups;
@@ -155,13 +155,13 @@ ${ configKoComponents.config() }
         var groupIndex = {};
         self.allGroups().forEach(function (group) {
           groupIndex[group.id] = group.name;
-        })
+        });
 
         self.groups().forEach(function (groupOverride) {
           groupOverride.group_ids().forEach(function (id) {
             groups[groupIndex[id]] = true;
           })
-        })
+        });
         return Object.keys(groups).sort().join(', ');
       });
     };
@@ -176,7 +176,7 @@ ${ configKoComponents.config() }
 
     var ConfigurationsViewModel = function () {
       var self = this;
-      self.apiHelper = apiHelper.getInstance({
+      self.apiHelper = ApiHelper.getInstance({
         user: '${ user.username }'
       });
       self.hasErrors = ko.observable(false);
@@ -299,7 +299,7 @@ ${ configKoComponents.config() }
 
     ko.applyBindings(new ConfigurationsViewModel());
 
-  });
+  })();
 </script>
 
 ${layout.commons()}

+ 2 - 12
desktop/core/src/desktop/static/desktop/js/fileBrowser/hueFileEntry.js

@@ -14,17 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-(function (root, factory) {
-  if(typeof define === "function" && define.amd) {
-    define([
-      'knockout',
-      'desktop/js/fileBrowser/hueDocument'
-    ], factory);
-  } else {
-    root.HueFileEntry = factory(ko);
-  }
-}(this, function (ko, HueDocument) {
-
+var HueFileEntry = (function () {
   var sorts = {
     defaultAsc: function (a, b) {
       if (a.isDirectory() && !b.isDirectory()) {
@@ -647,4 +637,4 @@
   };
 
   return HueFileEntry;
-}));
+})();

+ 2 - 14
desktop/core/src/desktop/static/desktop/js/home2.vm.js

@@ -14,19 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-(function (root, factory) {
-  if(typeof define === "function" && define.amd) {
-    define([
-      'knockout',
-      'desktop/js/apiHelper',
-      'desktop/js/fileBrowser/hueFileEntry',
-      'knockout-mapping'
-    ], factory);
-  } else {
-    root.HomeViewModel = factory(ko, apiHelper, HueFileEntry);
-  }
-}(this, function (ko, ApiHelper, HueFileEntry) {
-
+var HomeViewModel = (function () {
 
   /**
    * @param {Object} options
@@ -129,4 +117,4 @@
   };
 
   return HomeViewModel;
-}));
+})();

+ 2 - 8
desktop/core/src/desktop/static/desktop/js/ko.charts.js

@@ -14,13 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-(function (factory) {
-  if(typeof require === "function") {
-    require(['knockout'], factory);
-  } else {
-    factory(ko);
-  }
-}(function (ko) {
+(function () {
 
   ko.HUE_CHARTS = {
     TYPES: {
@@ -1653,4 +1647,4 @@
     d3.tip = tipBuilder;
   }
 
-}));
+})();

+ 2 - 12
desktop/core/src/desktop/templates/file_browser.mako

@@ -730,17 +730,7 @@ from desktop.views import _ko
   </script>
 
   <script type="text/javascript" charset="utf-8">
-    (function (factory) {
-      if(typeof require === "function") {
-        define('fileBrowser', [
-          'knockout',
-          'ko.switch-case'
-        ], factory);
-      } else {
-        factory(ko);
-      }
-    }(function (ko) {
-
+    (function () {
       ko.bindingHandlers.trashDroppable = {
         init: function(element, valueAccessor, allBindings, boundEntry) {
           var dragData;
@@ -995,6 +985,6 @@ from desktop.views import _ko
         viewModel: FileBrowser,
         template: { element: 'fb-template' }
       });
-    }));
+    })();
   </script>
 </%def>

+ 20 - 13
desktop/core/src/desktop/templates/home2.mako

@@ -20,11 +20,27 @@
 
 <%namespace name="assist" file="/assist.mako" />
 <%namespace name="fileBrowser" file="/file_browser.mako" />
-<%namespace name="require" file="/require.mako" />
 
 ${ commonheader(_('Welcome Home'), "home", user) | n,unicode }
 
-${ require.config() }
+<script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout.min.js') }"></script>
+<script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
+<script src="${ static('desktop/js/apiHelper.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-mapping.min.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>
+<script src="${ static('desktop/js/ko.editable.js') }"></script>
+<script src="${ static('desktop/js/ko.hue-bindings.js') }"></script>
+<script src="${ static('desktop/js/ko.switch-case.js') }"></script>
+<script src="${ static('desktop/js/jquery.huedatatable.js') }"></script>
+<script src="${ static('desktop/ext/js/jquery/plugins/jquery.mousewheel.min.js') }"></script>
+<script src="${ static('desktop/ext/js/jquery.mCustomScrollbar.concat.min.js') }"></script>
+<script src="${ static('desktop/js/assist/assistDbEntry.js') }"></script>
+<script src="${ static('desktop/js/assist/assistDbSource.js') }"></script>
+<script src="${ static('desktop/js/assist/assistHdfsEntry.js') }"></script>
+<script src="${ static('desktop/js/fileBrowser/hueDocument.js') }"></script>
+<script src="${ static('desktop/js/fileBrowser/hueFileEntry.js') }"></script>
+<script src="${ static('desktop/js/home2.vm.js') }"></script>
 
 ${ assist.assistPanel() }
 ${ fileBrowser.fileBrowser() }
@@ -220,16 +236,7 @@ ${ fileBrowser.fileBrowser() }
 </script>
 
 <script type="text/javascript" charset="utf-8">
-  require([
-    'knockout',
-    'desktop/js/home2.vm',
-    'assistPanel',
-    'fileBrowser',
-    'knockout-mapping',
-    'knockout-sortable',
-    'ko.hue-bindings'
-  ], function (ko, HomeViewModel) {
-
+  (function () {
     ko.options.deferUpdates = true;
 
     var userGroups = [];
@@ -290,7 +297,7 @@ ${ fileBrowser.fileBrowser() }
       huePubSub.publish('init.tour');
 
     });
-  });
+  })();
 
   huePubSub.subscribe('init.tour', function(){
     if ($.totalStorage("jHueTourHideModal") == null || $.totalStorage("jHueTourHideModal") == false) {

+ 2 - 13
desktop/core/src/desktop/templates/nav_components.mako

@@ -41,18 +41,7 @@ from metadata.conf import has_navigator
   </script>
 
   <script type="text/javascript" charset="utf-8">
-    (function (factory) {
-      if(typeof require === "function") {
-        require([
-          'knockout',
-          'desktop/js/apiHelper',
-          'selectize'
-        ], factory);
-      } else {
-        factory(ko, ApiHelper);
-      }
-    }(function (ko, ApiHelper) {
-
+    (function () {
       /**
        * @param {object} params
        * @param {String} sourceType
@@ -166,6 +155,6 @@ from metadata.conf import has_navigator
         viewModel: NavTags,
         template: { element: 'nav-tags-template' }
       });
-    }));
+    })();
   </script>
 </%def>

+ 23 - 21
desktop/libs/indexer/src/indexer/templates/indexer.mako

@@ -22,13 +22,29 @@
 
 <%namespace name="actionbar" file="actionbar.mako" />
 <%namespace name="assist" file="/assist.mako" />
-<%namespace name="require" file="/require.mako" />
 
 ${ commonheader(_("Solr Indexes"), "search", user, "60px") | n,unicode }
 
-${ require.config() }
-
-${ assist.assistPanel() }
+<script src="${ static('desktop/js/jquery.hiveautocomplete.js') }" type="text/javascript" charset="utf-8"></script>
+<script src="${ static('desktop/js/jquery.hdfsautocomplete.js') }" type="text/javascript" charset="utf-8"></script>
+<script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
+<script src="${ static('desktop/js/jquery.huedatatable.js') }"></script>
+<script src="${ static('desktop/ext/js/d3.v3.js') }" type="text/javascript" charset="utf-8"></script>
+<script src="${ static('desktop/ext/js/knockout.min.js') }"></script>
+<script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
+<script src="${ static('desktop/js/apiHelper.js') }"></script>
+<script src="${ static('metastore/js/metastore.ko.js') }"></script>
+<script src="${ static('desktop/js/ko.charts.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-mapping.min.js') }"></script>
+<script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>
+<script src="${ static('desktop/js/ko.editable.js') }"></script>
+<script src="${ static('desktop/js/ko.hue-bindings.js') }"></script>
+<script src="${ static('desktop/js/assist/assistDbEntry.js') }"></script>
+<script src="${ static('desktop/js/assist/assistDbSource.js') }"></script>
+<script src="${ static('desktop/js/assist/assistHdfsEntry.js') }"></script>
+<script src="${ static('desktop/js/fileBrowser/hueDocument.js') }"></script>
+<script src="${ static('desktop/js/fileBrowser/hueFileEntry.js') }"></script>
+<script src="${ static('notebook/js/notebook.ko.js') }"></script>
 
 <link rel="stylesheet" href="${ static('notebook/css/notebook.css') }">
 <link rel="stylesheet" href="${ static('desktop/css/wizard.css') }">
@@ -101,8 +117,7 @@ ${ assist.assistPanel() }
 
 </style>
 
-<script src="${ static('desktop/js/jquery.hiveautocomplete.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/js/jquery.hdfsautocomplete.js') }" type="text/javascript" charset="utf-8"></script>
+${ assist.assistPanel() }
 
 <div class="navbar navbar-inverse navbar-fixed-top">
   <div class="navbar-inner">
@@ -495,19 +510,7 @@ ${ assist.assistPanel() }
 
 
 <script type="text/javascript" charset="utf-8">
-
-  require([
-    "knockout",
-    "ko.charts",
-    "desktop/js/apiHelper",
-    "notebook/js/notebook.ko",
-    "assistPanel",
-    "knockout-mapping",
-    "knockout-sortable",
-    "ko.editable",
-    "ko.hue-bindings"
-  ], function (ko, charts, ApiHelper, EditorViewModel) {
-
+  (function () {
     ko.options.deferUpdates = true;
 
     var fieldNum = 0;
@@ -1032,9 +1035,8 @@ ${ assist.assistPanel() }
           }
         }
       });
-
     });
-  });
+  })();
 </script>
 
 ${ commonfooter(request, messages) | n,unicode }

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä