aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Gruntfile.js14
-rwxr-xr-xapp/Resources/static/themes/baggy/js/init.js7
-rw-r--r--package.json19
3 files changed, 32 insertions, 8 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 92774081..bf488ff9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -67,12 +67,22 @@ module.exports = function (grunt) {
67 transform: [ 67 transform: [
68 ["babelify", { 68 ["babelify", {
69 presets: ["es2015"] 69 presets: ["es2015"]
70 }], "browserify-shim" 70 }], ["browserify-shim", {
71 "jquery": {
72 "exports": "$"
73 },
74 "materialize": "materialize",
75 "jquery-ui": {
76 "depends": "jquery",
77 "exports": null
78 }
79 }]
71 ], 80 ],
72 browserifyOptions: { 81 browserifyOptions: {
73 browser: { 82 browser: {
74 "jQuery": "./node_modules/jquery/dist/jquery.js", 83 "jQuery": "./node_modules/jquery/dist/jquery.js",
75 "jquery.tinydot": "./nodes_modules/jquery.tinydot/src/jquery.tinydot.js" 84 "jquery.tinydot": "./node_modules/jquery.tinydot/src/jquery.tinydot.js",
85 "jquery.ui": "./node_modules/jquery-ui-browserify/dist/jquery-ui.js"
76 } 86 }
77 } 87 }
78 } 88 }
diff --git a/app/Resources/static/themes/baggy/js/init.js b/app/Resources/static/themes/baggy/js/init.js
index c6a54f6f..8da9a859 100755
--- a/app/Resources/static/themes/baggy/js/init.js
+++ b/app/Resources/static/themes/baggy/js/init.js
@@ -1,6 +1,6 @@
1const $ = global.jquery = require('jquery'); 1const $ = global.jquery = require('jquery');
2require('jquery.cookie'); 2require('jquery.cookie');
3require('jquery-ui'); 3require('jquery-ui-browserify');
4const annotator = require('annotator'); 4const annotator = require('annotator');
5import { savePercent, retrievePercent } from '../../_global/js/tools.js'; 5import { savePercent, retrievePercent } from '../../_global/js/tools.js';
6import { split, extractLast } from './autoCompleteTags.js'; 6import { split, extractLast } from './autoCompleteTags.js';
@@ -124,6 +124,10 @@ $.fn.ready(() => {
124 /** 124 /**
125 * Tags autocomplete 125 * Tags autocomplete
126 */ 126 */
127 /**
128 * Not working on v2
129 *
130
127 $('#value').bind('keydown', (event) => { 131 $('#value').bind('keydown', (event) => {
128 if (event.keyCode === $.ui.keyCode.TAB && $(this).data('ui-autocomplete').menu.active) { 132 if (event.keyCode === $.ui.keyCode.TAB && $(this).data('ui-autocomplete').menu.active) {
129 event.preventDefault(); 133 event.preventDefault();
@@ -156,6 +160,7 @@ $.fn.ready(() => {
156 return false; 160 return false;
157 }, 161 },
158 }); 162 });
163 */
159 164
160 //--------------------------------------------------------------------------- 165 //---------------------------------------------------------------------------
161 // Close the message box when the user clicks the close icon 166 // Close the message box when the user clicks the close icon
diff --git a/package.json b/package.json
index 78970f8f..f7918d8f 100644
--- a/package.json
+++ b/package.json
@@ -27,17 +27,21 @@
27 "grunt-contrib-uglify": "^1.0.0", 27 "grunt-contrib-uglify": "^1.0.0",
28 "grunt-postcss": "^0.8.0", 28 "grunt-postcss": "^0.8.0",
29 "hammerjs": "^2.0.6", 29 "hammerjs": "^2.0.6",
30 "jquery": "^2.2.1", 30 "icomoon-free-npm": "0.0.0",
31 "jquery-ui": "^1.10.5", 31 "jquery": "^2.2.4",
32 "jquery-ui-browserify": "^1.11.0-pre-seelio",
32 "jquery.cookie": "^1.4.1", 33 "jquery.cookie": "^1.4.1",
33 "jquery.tinydot": "^0.2.1", 34 "jquery.tinydot": "^0.2.1",
34 "load-grunt-tasks": "^3.4.1", 35 "load-grunt-tasks": "^3.4.1",
36 "material-design-icons-iconfont": "^3.0.0",
35 "materialize-css": "0.97.5", 37 "materialize-css": "0.97.5",
36 "npm": "^3.8.3", 38 "npm": "^3.8.3",
37 "pickadate": "^3.5.6", 39 "pickadate": "^3.5.6",
38 "pixrem": "^3.0.0", 40 "pixrem": "^3.0.0",
39 "postcss-cssnext": "^2.5.1", 41 "postcss-cssnext": "^2.5.1",
40 "prismjs": "^1.4.1", 42 "prismjs": "^1.4.1",
43 "ptsans-npm-webfont": "0.0.4",
44 "roboto-fontface": "^0.6.0",
41 "through": "^2.3.8" 45 "through": "^2.3.8"
42 }, 46 },
43 "engines": { 47 "engines": {
@@ -49,9 +53,14 @@
49 "materialize": "./node_modules/materialize-css/bin/materialize.js" 53 "materialize": "./node_modules/materialize-css/bin/materialize.js"
50 }, 54 },
51 "browserify-shim": { 55 "browserify-shim": {
52 "jquery": "$", 56 "jquery": {
53 "jQuery": "jQuery", 57 "exports": "$"
54 "materialize": "materialize" 58 },
59 "materialize": "materialize",
60 "jquery-ui": {
61 "depends": "jquery",
62 "exports": null
63 }
55 }, 64 },
56 "browserify": { 65 "browserify": {
57 "transform": [ 66 "transform": [