Browse Source

use npm jquery-ui

experimental
Paweł Jedwabny 4 years ago
parent
commit
0e97aaf05c
7 changed files with 8 additions and 26 deletions
  1. +1
    -1
      index.php
  2. +0
    -7
      libs/jquery-ui-1.12.1.custom.min.css
  3. +0
    -9
      libs/jquery-ui-1.12.1.custom.min.js
  4. +0
    -6
      libs/jquery-ui.txt
  5. +2
    -1
      package.json
  6. +3
    -1
      src/index.js
  7. +2
    -1
      webpack.config.js

+ 1
- 1
index.php View File

@@ -61,7 +61,7 @@ ob_start();
<meta name="robots" content="NOINDEX, NOARCHIVE">
<script type='text/javascript' src='dist/index.js'></script>
<?php
$csses = array('libs/jquery-ui-1.12.1.custom.min.css', 'vendor/bower-asset/gentelella/build/css/custom.css','vendor/bower-asset/gentelella/vendors/select2/dist/css/select2.css','vendor/bower-asset/gentelella/vendors/font-awesome/css/font-awesome.min.css');
$csses = array('vendor/bower-asset/gentelella/build/css/custom.css','vendor/bower-asset/gentelella/vendors/select2/dist/css/select2.css','vendor/bower-asset/gentelella/vendors/font-awesome/css/font-awesome.min.css');
foreach($csses as $css)
print('<link href="'.$css.'" rel="stylesheet" type="text/css">');
?>


+ 0
- 7
libs/jquery-ui-1.12.1.custom.min.css
File diff suppressed because it is too large
View File


+ 0
- 9
libs/jquery-ui-1.12.1.custom.min.js
File diff suppressed because it is too large
View File


+ 0
- 6
libs/jquery-ui.txt View File

@@ -1,6 +0,0 @@
custom package:
- all core
- all interactions
- widgets - only: accordion, autocomplete, menu, mouse

Tooltip from jquery.ui conflicts with tooltip from bootstrap!

+ 2
- 1
package.json View File

@@ -33,6 +33,7 @@
},
"dependencies": {
"bootstrap": "^3.3.7",
"jquery": "^2.x.x"
"jquery": "^2.x.x",
"jquery-ui": "^1.12.1"
}
}

+ 3
- 1
src/index.js View File

@@ -3,9 +3,11 @@ import jQuery from 'expose-loader?jq!expose-loader?jQuery!expose-loader?$!jquery
import 'bootstrap';
import 'bootstrap/less/bootstrap.less';

import 'jquery-ui';
import 'jquery-ui/themes/base/all.css'

import 'script-loader!../libs/HistoryKeeper.js';
import 'script-loader!../vendor/bower-asset/gentelella/vendors/select2/dist/js/select2.js';
import 'script-loader!../libs/jquery-ui-1.12.1.custom.min.js';
import 'script-loader!../libs/jquery.clonePosition.js';
import 'script-loader!../libs/Chart.js';



+ 2
- 1
webpack.config.js View File

@@ -13,7 +13,8 @@ module.exports = {
{test: /\.woff(2)?(\?v=\d+\.\d+\.\d+)?$/, loader: "url-loader?limit=10000&mimetype=application/font-woff" },
{test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: "url-loader?limit=10000&mimetype=application/octet-stream" },
{test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: "file-loader" },
{test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: "url-loader?limit=10000&mimetype=image/svg+xml" }
{test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: "url-loader?limit=10000&mimetype=image/svg+xml" },
{test: /\.(png|jpg|gif)$/, loader: "file-loader" }
]
}
};

Loading…
Cancel
Save