Merge 4abe88f into 9648105

CometVisu · Oct 19, 2016 · a1d1870 · a1d1870
2 parents 9648105 + 4abe88f
commit a1d1870
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -207,6 +207,7 @@ module.exports = function(grunt) {
         src: [
           'index.html',
           'visu_config.xsd',
+          'dependencies/jquery.js',
           'dependencies/require-2.1.15.min.js',
           'dependencies/css.js',
           'icon/*.png',
@@ -236,7 +237,8 @@ module.exports = function(grunt) {
           buildCSS: false,
           paths: {
             'css-builder': '../build/css-builder',
-            'normalize': '../build/normalize'
+            'normalize': '../build/normalize',
+            'jquery': 'empty:'
           },
 
           modules: [

diff --git a/src/main.js b/src/main.js
@@ -76,7 +76,7 @@ require.config({
 
 var templateEngine;
 require([
-  'jquery', 'TemplateEngine'
+  'jquery', 'lib/TemplateEngine'
 ], function( $, TemplateEngine ) {
   "use strict";
   profileCV( 'templateEngine start' );