Commit 7ab0a411 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Refactoring JS pour formatage d'URLs

parent 2a24b044
Loading
Loading
Loading
Loading
+1 −1
Changes for code/DiagrammeBdd.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ foreach ($cls as $cl) {

    $(function () {

        WidgetInitializer.includeJs(Url('vendor/go.js'));
        WidgetInitializer.includeJs(Util.url('vendor/go.js'));

        var $ = go.GraphObject.make;

+41 −10
Changes for code/test3.php: 41 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -8,18 +8,49 @@
 * @var $viewFile   string
 */
?>
<div class="vue-app">
<div class="res">

</div>
<script type="text/javascript">

    <h2>mission</h2>
    <mission mission="{msg:'test de mission'}"></mission>
    Util.ajax = function (params) {

    <h2>test</h2>
    <mission-test msg="Et voici mon test!"></mission-test>
        if (params.type === undefined) {
            params.type = 'POST';
        }

    <h2>Hello world</h2>
    <hello-world msg="bonjour le monde de partout!"></hello-world>
        params.url = Util.url(params.url);

    <h2>Missions</h2>
    <mission-missions intervenant="100000" can-add-mission="1"></mission-missions>
</div>
 No newline at end of file
        // var getArgs = data ? $.param(data) : null;
        // return Url.getBase() + route + (getArgs ? '?' + getArgs : '');
        //
        // params.url = Url.getBase().

    };



    $(function () {
        console.clear();

        let route = 'mission/liste/:intervenant';
        let params = {intervenant: '1000000000'};
        //let query = {order: 'ASC'};
        let query = undefined;

        console.log(Util.url(route, params, query));
        /*
                $.ajax({
                    type: 'POST',
                    //url: '/mission/liste/:intervenant',
                    url: '/mission/liste/1000000000',
                    urlParams: {intervenant: 1000000000},
                    data: this.mission,
                    success: function (response) {
                        console.log(response);
                    }
                });
        */

    });
</script>
 No newline at end of file
+11
Changes for front/components/Mission/Liste.vue: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -9,7 +9,18 @@ export default {
  props: {
    intervenant: {},
    canAddMission: {}
  },
  mounted()
  {
    $.ajax({
      url: Util.url("mission/liste/:intervenant", {intervenant: this.intervenant}),
      success: (response) => {

        //console.log(response);
      }
    });
  }

}
</script>

+2 −2
Changes for module/Application/view/application/piece-jointe/index.phtml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -94,8 +94,8 @@ $menuUrl = $this->url('piece-jointe/intervenant', ['intervenant' => $intervenant
        $(function () {

            //WidgetInitializer.add('piece-jointe', 'pieceJointe', function(){
            //    WidgetInitializer.includeJs(Url('js/piece_jointe.js'));
            //    WidgetInitializer.includeCss(Url('css/piece_jointe.css'));
            //    WidgetInitializer.includeJs(Util.url('js/piece_jointe.js'));
            //    WidgetInitializer.includeCss(Util.url('css/piece_jointe.css'));
            //});

            $('.piece-jointe').pieceJointe({
+3 −2
Changes for module/Application/view/application/piece-jointe/refuser.phtml: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -44,8 +44,9 @@ echo $this->form()->closeTag();
     * @param {string} selector
     * @param {object} form
     */
    function installEditor(selector, form) {
        WidgetInitializer.includeJs(Url('vendor/tinymce-4.4.1/js/tinymce/tinymce.min.js'));
    function installEditor(selector, form)
    {
        WidgetInitializer.includeJs(Util.url('vendor/tinymce-4.4.1/js/tinymce/tinymce.min.js'));
        tinymce.editors = [];
        tinymce.init({
            selector: selector,
Loading