mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-01-11 01:15:26 +00:00
Code Issues Projects Releases Wiki Activity

remove autocomplete and bring fonts through npm

Browse source
This commit is contained in:
Thomas Citharel 2016-09-28 18:59:15 +02:00
parent fc487c4eb1
commit 8f234d0156
No known key found for this signature in database
GPG key ID: 5780691F5FE48FB5
3 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Gruntfile.js
View file

@ -67,12 +67,22 @@ module.exports = function (grunt) {
transform: [ transform: [
["babelify", { ["babelify", {
presets: ["es2015"] presets: ["es2015"]
}], "browserify-shim" }], ["browserify-shim", {
"jquery": {
"exports": "$"
},
"materialize": "materialize",
"jquery-ui": {
"depends": "jquery",
"exports": null
}
}]
], ],
browserifyOptions: { browserifyOptions: {
browser: { browser: {
"jQuery": "./node_modules/jquery/dist/jquery.js", "jQuery": "./node_modules/jquery/dist/jquery.js",
"jquery.tinydot": "./nodes_modules/jquery.tinydot/src/jquery.tinydot.js" "jquery.tinydot": "./node_modules/jquery.tinydot/src/jquery.tinydot.js",
"jquery.ui": "./node_modules/jquery-ui-browserify/dist/jquery-ui.js"
} }
} }
} }

7
app/Resources/static/themes/baggy/js/init.js
View file

@ -1,6 +1,6 @@
const $ = global.jquery = require('jquery'); const $ = global.jquery = require('jquery');
require('jquery.cookie'); require('jquery.cookie');
require('jquery-ui'); require('jquery-ui-browserify');
const annotator = require('annotator'); const annotator = require('annotator');
import { savePercent, retrievePercent } from '../../_global/js/tools.js'; import { savePercent, retrievePercent } from '../../_global/js/tools.js';
import { split, extractLast } from './autoCompleteTags.js'; import { split, extractLast } from './autoCompleteTags.js';
@ -124,6 +124,10 @@ $.fn.ready(() => {
/** /**
* Tags autocomplete * Tags autocomplete
*/ */
/**
* Not working on v2
*
$('#value').bind('keydown', (event) => { $('#value').bind('keydown', (event) => {
if (event.keyCode === $.ui.keyCode.TAB && $(this).data('ui-autocomplete').menu.active) { if (event.keyCode === $.ui.keyCode.TAB && $(this).data('ui-autocomplete').menu.active) {
event.preventDefault(); event.preventDefault();
@ -156,6 +160,7 @@ $.fn.ready(() => {
return false; return false;
}, },
}); });
*/
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Close the message box when the user clicks the close icon // Close the message box when the user clicks the close icon

19
package.json
View file

@ -27,17 +27,21 @@
"grunt-contrib-uglify": "^1.0.0", "grunt-contrib-uglify": "^1.0.0",
"grunt-postcss": "^0.8.0", "grunt-postcss": "^0.8.0",
"hammerjs": "^2.0.6", "hammerjs": "^2.0.6",
"jquery": "^2.2.1", "icomoon-free-npm": "0.0.0",
"jquery-ui": "^1.10.5", "jquery": "^2.2.4",
"jquery-ui-browserify": "^1.11.0-pre-seelio",
"jquery.cookie": "^1.4.1", "jquery.cookie": "^1.4.1",
"jquery.tinydot": "^0.2.1", "jquery.tinydot": "^0.2.1",
"load-grunt-tasks": "^3.4.1", "load-grunt-tasks": "^3.4.1",
"material-design-icons-iconfont": "^3.0.0",
"materialize-css": "0.97.5", "materialize-css": "0.97.5",
"npm": "^3.8.3", "npm": "^3.8.3",
"pickadate": "^3.5.6", "pickadate": "^3.5.6",
"pixrem": "^3.0.0", "pixrem": "^3.0.0",
"postcss-cssnext": "^2.5.1", "postcss-cssnext": "^2.5.1",
"prismjs": "^1.4.1", "prismjs": "^1.4.1",
"ptsans-npm-webfont": "0.0.4",
"roboto-fontface": "^0.6.0",
"through": "^2.3.8" "through": "^2.3.8"
}, },
"engines": { "engines": {
@ -49,9 +53,14 @@
"materialize": "./node_modules/materialize-css/bin/materialize.js" "materialize": "./node_modules/materialize-css/bin/materialize.js"
}, },
"browserify-shim": { "browserify-shim": {
"jquery": "$", "jquery": {
"jQuery": "jQuery", "exports": "$"
"materialize": "materialize" },
"materialize": "materialize",
"jquery-ui": {
"depends": "jquery",
"exports": null
}
}, },
"browserify": { "browserify": {
"transform": [ "transform": [