Browse Source

Merge pull request #216 from MindTooth/fix_error

Fixes compile error with webpack.mix.js and app.js
pull/217/head
KodeStar 6 years ago
committed by GitHub
parent
commit
e8673634bc
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1590
      public/js/app.js
  2. 4
      public/mix-manifest.json
  3. 7
      resources/assets/js/app.js
  4. 2
      webpack.mix.js

1590
public/js/app.js

File diff suppressed because one or more lines are too long

4
public/mix-manifest.json

@ -1,4 +1,4 @@
{
"/js/app.js": "/js/app.js?id=58b8bcf2d5c2eee74c51",
"/css/app.css": "/css/app.css?id=e405a67622368f195d1b"
"/css/app.css": "/css/app.css?id=e405a67622368f195d1b",
"/js/app.js": "/js/app.js?id=32cbf6f4924b46ae7e05"
}

7
resources/assets/js/app.js

@ -1,6 +1,3 @@
import Huebee from 'huebee';
window.Huebee = Huebee;
$.when( $.ready ).then(function() {
if($('.message-container').length) {
@ -122,7 +119,7 @@ $.when( $.ready ).then(function() {
e.preventDefault();
var apiurl = $('#create input[name=url]').val();
var override_url = $('#create input[name="config[override_url]"').val();
var override_url = $('#create input[name="config[override_url]"]').val();
if(override_url.length && override_url != '') {
apiurl = override_url;
}
@ -134,7 +131,7 @@ $.when( $.ready ).then(function() {
data[config] = $(this).val();
});
$.post('/test_config', { data }, function(data) {
$.post('/test_config', { data: data }, function(data) {
alert(data);
});

2
webpack.mix.js

@ -11,7 +11,7 @@ let mix = require('laravel-mix');
|
*/
mix.js([
mix.scripts([
//'resources/assets/js/jquery-ui.min.js',
'resources/assets/js/huebee.js',
'resources/assets/js/app.js'

Loading…
Cancel
Save