Commit 33a80cbc authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

Merge branch '296-gulp-fur-js' into 'development'

Resolve "Gulp für JS"

Closes #296

See merge request !488
parents ff923f98 9bcec3d8
...@@ -154,7 +154,6 @@ class LanguageController extends Controller ...@@ -154,7 +154,6 @@ class LanguageController extends Controller
->with('langTexts', $langTexts) ->with('langTexts', $langTexts)
->with('sum', $sum) ->with('sum', $sum)
->with('css', 'editLanguage.css') ->with('css', 'editLanguage.css')
->with('js', ['editLanguage.js'])
->with('new', $ex["new"]); ->with('new', $ex["new"]);
} }
......
...@@ -12,4 +12,5 @@ require('laravel-elixir-vue-2'); ...@@ -12,4 +12,5 @@ require('laravel-elixir-vue-2');
*/ */
elixir(function(mix) { elixir(function(mix) {
mix.less('default.less', 'public/css/themes/default.css'); mix.less('default.less', 'public/css/themes/default.css');
mix.scripts(['jquery.js', 'bootstrap.js', 'widgets.js', 'editLanguage.js', 'kontakt.js', 'lightslider.js', 'masonry.js', 'imagesloaded', 'openpgp.min.js', 'scriptResultPage.js', 'scriptStartPage.js', 'settings.js' /*, '/vue/app.js', '/vue/bootstrap.js'*/ ]);
}); });
\ No newline at end of file
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
$(document).ready(function() { $(document).ready(function() {
$(".hint").tooltip(); $(".hint").tooltip();
$("textarea").each(function() { $(".language-text-area").each(function() {
auto_grow(this); auto_grow(this);
}); });
$("textarea").keyup(function() { $(".language-text-area").keyup(function() {
auto_grow(this); auto_grow(this);
}); });
}); });
......
...@@ -39,9 +39,9 @@ function encrypt() { ...@@ -39,9 +39,9 @@ function encrypt() {
} }
$(document).ready(function() { $(document).ready(function() {
if (isEnglish()) { if (isEnglish()) {
$("button[type=submit]").html("encrypt and send"); $(".encrypt-btn").html("encrypt and send");
} else { } else {
$("button[type=submit]").html("Verschlüsseln und senden"); $(".encrypt-btn").html("Verschlüsseln und senden");
} }
$(".contact").submit(function() { $(".contact").submit(function() {
return encrypt(this); return encrypt(this);
......
...@@ -26,7 +26,7 @@ function tabs() { ...@@ -26,7 +26,7 @@ function tabs() {
}); });
} }
function getDocumentReadyForUse(fokus = "") { function getDocumentReadyForUse(fokus) {
clickLog(); clickLog();
popovers(); popovers();
if (fokus === "bilder") imageLoader(); if (fokus === "bilder") imageLoader();
......
/** /**
* First we will load all of this project's JavaScript dependencies which * First we will load all of this project's JavaScript dependencies which
* include Vue and Vue Resource. This gives a great starting point for * include Vue and Vue Resource. This gives a great starting point for
* building robust, powerful web applications using Vue and Laravel. * building robust, powerful web applications using Vue and Laravel.
*/ */
//require('./bootstrap');
require('./bootstrap');
/** /**
* Next, we will create a fresh Vue application instance and attach it to * Next, we will create a fresh Vue application instance and attach it to
* the body of the page. From here, you may begin adding components to * the body of the page. From here, you may begin adding components to
* the application, or feel free to tweak this setup for your needs. * the application, or feel free to tweak this setup for your needs.
*/ */
/*Vue.component('example', require('./components/Example.vue'));
Vue.component('example', require('./components/Example.vue'));
const app = new Vue({ const app = new Vue({
el: '#app' el: '#app'
}); });*/
\ No newline at end of file
window._ = require('lodash');
/**
* We'll load jQuery and the Bootstrap jQuery plugin which provides support
* for JavaScript based Bootstrap features such as modals and tabs. This
* code may be modified to fit the specific needs of your application.
*/
window.$ = window.jQuery = require('jquery');
require('bootstrap-sass');
/**
* Vue is a modern JavaScript library for building interactive web interfaces
* using reactive data binding and reusable components. Vue's API is clean
* and simple, leaving you to focus on building your next great project.
*/
window.Vue = require('vue');
require('vue-resource');
/**
* We'll register a HTTP interceptor to attach the "CSRF" header to each of
* the outgoing requests issued by this application. The CSRF middleware
* included with Laravel will automatically verify the header's value.
*/
Vue.http.interceptors.push((request, next) => {
request.headers.set('X-CSRF-TOKEN', Laravel.csrfToken);
next();
});
/**
* Echo exposes an expressive API for subscribing to channels and listening
* for events that are broadcast by Laravel. Echo and event broadcasting
* allows your team to easily build robust real-time web applications.
*/
// import Echo from "laravel-echo"
// window.Echo = new Echo({
// broadcaster: 'pusher',
// key: 'your-pusher-key'
// });
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment