diff --git a/Gemfile b/Gemfile index cc43823e0..209f56b82 100644 --- a/Gemfile +++ b/Gemfile @@ -64,9 +64,6 @@ gem 'rbnacl-libsodium' gem 'bcrypt' gem 'rgeo-geojson' -gem 'leaflet-rails' -gem 'leaflet-markercluster-rails', '~> 0.7.0' -gem 'leaflet-draw-rails' gem 'chartkick' diff --git a/Gemfile.lock b/Gemfile.lock index 83bec46a6..638edc9d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -455,10 +455,6 @@ GEM kgio (2.11.2) launchy (2.4.3) addressable (~> 2.3) - leaflet-draw-rails (0.1.0) - leaflet-markercluster-rails (0.7.0) - railties (>= 3.1) - leaflet-rails (0.7.7) letter_opener (1.6.0) launchy (~> 2.2) letter_opener_web (1.3.4) @@ -858,9 +854,6 @@ DEPENDENCIES jquery-rails kaminari launchy - leaflet-draw-rails - leaflet-markercluster-rails (~> 0.7.0) - leaflet-rails letter_opener_web lograge logstash-event diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index da1d7902f..9f8b2dedb 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,34 +13,21 @@ //= require_tree ./old_design //= require bootstrap-sprockets -//= require leaflet.js -//= require d3.min -//= require clipper -//= require concavehull.min -//= require leaflet.freedraw //= require smart_listing -//= require turf-area -//= require franceconnect //= require bootstrap-wysihtml5 //= require bootstrap-wysihtml5/locales/fr-FR +/* globals $ */ + $(document).on('turbolinks:load', application_init); -function application_init(){ +function application_init() { tooltip_init(); - scroll_to(); } function tooltip_init() { - $('.action_button[data-toggle="tooltip"]').tooltip({delay: { "show": 100, "hide": 100 }}); - $('[data-toggle="tooltip"]').tooltip({delay: { "show": 800, "hide": 100 }}); -} - -function scroll_to() { - $('.js-scrollTo').on('click', function () { // Au clic sur un élément - var page = $(this).attr('cible'); // Page cible - var speed = 600; // Durée de l'animation (en ms) - $('html, body').animate({scrollTop: $(page).offset().top - 200}, speed); // Go - return false; + $('.action_button[data-toggle="tooltip"]').tooltip({ + delay: { show: 100, hide: 100 } }); + $('[data-toggle="tooltip"]').tooltip({ delay: { show: 800, hide: 100 } }); } diff --git a/app/assets/javascripts/old_design/admin.js b/app/assets/javascripts/old_design/admin.js index 5b7af468e..9b45a08c2 100644 --- a/app/assets/javascripts/old_design/admin.js +++ b/app/assets/javascripts/old_design/admin.js @@ -1,3 +1,5 @@ +/* globals $ */ + $(document).on('click', '.delete', function() { $(this).hide(); $(this) diff --git a/app/assets/javascripts/old_design/admin_procedures_modal.js b/app/assets/javascripts/old_design/admin_procedures_modal.js index d02923e37..1d4c569e3 100644 --- a/app/assets/javascripts/old_design/admin_procedures_modal.js +++ b/app/assets/javascripts/old_design/admin_procedures_modal.js @@ -1,3 +1,5 @@ +/* globals $ */ + $(document).on('turbolinks:load', init_path_modal); var PROCEDURE_PATH_SELECTOR = 'input[data-autocomplete=path]'; @@ -10,23 +12,22 @@ function init_path_modal() { } function path_modal_action() { - $('#publish-modal').on('show.bs.modal', function (event) { - $("#publish-modal .modal-body .table .tr-content").hide(); + $('#publish-modal').on('show.bs.modal', function(event) { + $('#publish-modal .modal-body .table .tr-content').hide(); - var button = $(event.relatedTarget) // Button that triggered the modal + var button = $(event.relatedTarget); // Button that triggered the modal var modal_title = button.data('modal_title'); // Extract info from data-* attributes var modal_index = button.data('modal_index'); // Extract info from data-* attributes - var modal = $(this) + var modal = $(this); modal.find('#publish-modal-title').html(modal_title); - $("#publish-modal .modal-body .table #"+modal_index).show(); - }) + $('#publish-modal .modal-body .table #' + modal_index).show(); + }); } function path_validation_action() { - $(PROCEDURE_PATH_SELECTOR).keyup(function (key) { - if (key.keyCode != 13) - path_validation(this); + $(PROCEDURE_PATH_SELECTOR).keyup(function(key) { + if (key.keyCode != 13) path_validation(this); }); } @@ -42,9 +43,8 @@ function togglePathMessage(valid, mine) { } if ((valid && mine === null) || mine === true) - $('#publish-modal #publish').removeAttr('disabled') - else - $('#publish-modal #publish').attr('disabled', 'disabled') + $('#publish-modal #publish').removeAttr('disabled'); + else $('#publish-modal #publish').attr('disabled', 'disabled'); } function path_validation(el) { @@ -53,22 +53,21 @@ function path_validation(el) { togglePathMessage(valid, null); } +function toggleErrorClass(node, boolean) { + if (boolean) $(node).removeClass('input-error'); + else $(node).addClass('input-error'); +} + function validatePath(path) { - var re = /^[a-z0-9_\-]{3,50}$/; + var re = /^[a-z0-9_-]{3,50}$/; return re.test(path); } function path_type_init() { - $(PROCEDURE_PATH_SELECTOR).bind('autocomplete:select', function(ev, suggestion) { + $(PROCEDURE_PATH_SELECTOR).bind('autocomplete:select', function( + ev, + suggestion + ) { togglePathMessage(true, suggestion['mine']); }); } - -function transfer_errors_message(show) { - if(show){ - $("#not_found_admin").slideDown(100) - } - else { - $("#not_found_admin").slideUp(100) - } -} diff --git a/app/assets/javascripts/old_design/archive.js b/app/assets/javascripts/old_design/archive.js index 8e7379815..d75dae5ad 100644 --- a/app/assets/javascripts/old_design/archive.js +++ b/app/assets/javascripts/old_design/archive.js @@ -1,3 +1,5 @@ +/* globals $ */ + $(document).on('click', 'button#archive-procedure', function() { $('button#archive-procedure').hide(); $('#confirm').show(); diff --git a/app/assets/javascripts/old_design/bootstrap_wysihtml5.js b/app/assets/javascripts/old_design/bootstrap_wysihtml5.js index 89f578d02..f0d3681f5 100644 --- a/app/assets/javascripts/old_design/bootstrap_wysihtml5.js +++ b/app/assets/javascripts/old_design/bootstrap_wysihtml5.js @@ -1,12 +1,14 @@ +/* globals $ */ + $(document).on('turbolinks:load', wysihtml5_active); -function wysihtml5_active (){ +function wysihtml5_active() { $('.wysihtml5').each(function(i, elem) { $(elem).wysihtml5({ toolbar: { - "fa": true, - "link": false, - "color": false + fa: true, + link: false, + color: false }, parserRules: { tags: { @@ -31,7 +33,7 @@ function wysihtml5_active (){ } } }, - "locale": "fr-FR" + locale: 'fr-FR' }); }); } diff --git a/app/assets/javascripts/old_design/carte/cadastre.js b/app/assets/javascripts/old_design/carte/cadastre.js deleted file mode 100644 index 81bff065c..000000000 --- a/app/assets/javascripts/old_design/carte/cadastre.js +++ /dev/null @@ -1,60 +0,0 @@ -function cadastre_active() { - return $("#map.cadastre").length > 0 -} - -function get_cadastre(coordinates) { - if (!cadastre_active()) - return; - - var cadastre; - - $.ajax({ - method: 'post', - url: '/users/dossiers/' + dossier_id + '/carte/cadastre', - data: {coordinates: JSON.stringify(coordinates)}, - dataType: 'json', - async: false - }).done(function (data) { - cadastre = data - }); - - return cadastre['cadastres']; -} - -function display_cadastre(cadastre_array) { - if (!cadastre_active()) - return; - - $("#cadastre.list ul").html(''); - new_cadastreLayer(); - - if (cadastre_array.length == 1 && cadastre_array[0]['zoom_error']) - $("#cadastre.list ul").html('
=i.length)return n;var r=[],u=a[e++];return n.forEach(function(n,u){r.push({key:n,values:t(u,e)})}),u?r.sort(function(n,t){return u(n.key,t.key)}):r}var e,r,u={},i=[],a=[];return u.map=function(t,e){return n(e,t,0)},u.entries=function(e){return t(n(oa.map,e,0),0)},u.key=function(n){return i.push(n),u},u.sortKeys=function(n){return a[i.length-1]=n,u},u.sortValues=function(n){return e=n,u},u.rollup=function(n){return r=n,u},u},oa.set=function(n){var t=new m;if(n)for(var e=0,r=n.length;r>e;++e)t.add(n[e]);return t},l(m,{has:h,add:function(n){return this._[s(n+="")]=!0,n},remove:g,values:p,size:v,empty:d,forEach:function(n){for(var t in this._)n.call(this,f(t))}}),oa.behavior={},oa.rebind=function(n,t){for(var e,r=1,u=arguments.length;++r=0&&(r=n.slice(e+1),n=n.slice(0,e)),n)return arguments.length<2?this[n].on(r):this[n].on(r,t);if(2===arguments.length){if(null==t)for(n in this)this.hasOwnProperty(n)&&this[n].on(r,null);return this}},oa.event=null,oa.requote=function(n){return n.replace(wa,"\\$&")};var wa=/[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g,Sa={}.__proto__?function(n,t){n.__proto__=t}:function(n,t){for(var e in t)n[e]=t[e]},ka=function(n,t){return t.querySelector(n)},Na=function(n,t){return t.querySelectorAll(n)},Ea=function(n,t){var e=n.matches||n[x(n,"matchesSelector")];return(Ea=function(n,t){return e.call(n,t)})(n,t)};"function"==typeof Sizzle&&(ka=function(n,t){return Sizzle(n,t)[0]||null},Na=Sizzle,Ea=Sizzle.matchesSelector),oa.selection=function(){return oa.select(sa.documentElement)};var Aa=oa.selection.prototype=[];Aa.select=function(n){var t,e,r,u,i=[];n=A(n);for(var a=-1,o=this.length;++a =0?n.slice(0,t):n,r=t>=0?n.slice(t+1):"in";return e=pl.get(e)||gl,r=vl.get(r)||y,br(r(e.apply(null,la.call(arguments,1))))},oa.interpolateHcl=Rr,oa.interpolateHsl=Dr,oa.interpolateLab=Pr,oa.interpolateRound=jr,oa.transform=function(n){var t=sa.createElementNS(oa.ns.prefix.svg,"g");return(oa.transform=function(n){if(null!=n){t.setAttribute("transform",n);var e=t.transform.baseVal.consolidate()}return new Ur(e?e.matrix:dl)})(n)},Ur.prototype.toString=function(){return"translate("+this.translate+")rotate("+this.rotate+")skewX("+this.skew+")scale("+this.scale+")"};var dl={a:1,b:0,c:0,d:1,e:0,f:0};oa.interpolateTransform=$r,oa.layout={},oa.layout.bundle=function(){return function(n){for(var t=[],e=-1,r=n.length;++et;++t)(r=M[t]).index=t,r.weight=0;for(t=0;c>t;++t)r=x[t],"number"==typeof r.source&&(r.source=M[r.source]),"number"==typeof r.target&&(r.target=M[r.target]),++r.source.weight,++r.target.weight;for(t=0;u>t;++t)r=M[t],isNaN(r.x)&&(r.x=n("x",f)),isNaN(r.y)&&(r.y=n("y",v)),isNaN(r.px)&&(r.px=r.x),isNaN(r.py)&&(r.py=r.y);if(i=[],"function"==typeof h)for(t=0;c>t;++t)i[t]=+h.call(this,x[t],t);else for(t=0;c>t;++t)i[t]=h;if(a=[],"function"==typeof g)for(t=0;c>t;++t)a[t]=+g.call(this,x[t],t);else for(t=0;c>t;++t)a[t]=g;if(o=[],"function"==typeof p)for(t=0;u>t;++t)o[t]=+p.call(this,M[t],t);else for(t=0;u>t;++t)o[t]=p;return l.resume()},l.resume=function(){return l.alpha(.1)},l.stop=function(){return l.alpha(0)},l.drag=function(){return r||(r=oa.behavior.drag().origin(y).on("dragstart.force",Qr).on("drag.force",t).on("dragend.force",nu)),arguments.length?void this.on("mouseover.force",tu).on("mouseout.force",eu).call(r):r},oa.rebind(l,c,"on")};var ml=20,yl=1,Ml=1/0;oa.layout.hierarchy=function(){function n(u){var i,a=[u],o=[];for(u.depth=0;null!=(i=a.pop());)if(o.push(i),(c=e.call(n,i,i.depth))&&(l=c.length)){for(var l,c,s;--l>=0;)a.push(s=c[l]),s.parent=i,s.depth=i.depth+1;r&&(i.value=0),i.children=c}else r&&(i.value=+r.call(n,i,i.depth)||0),delete i.children;return au(u,function(n){var e,u;t&&(e=n.children)&&e.sort(t),r&&(u=n.parent)&&(u.value+=n.value)}),o}var t=cu,e=ou,r=lu;return n.sort=function(e){return arguments.length?(t=e,n):t},n.children=function(t){return arguments.length?(e=t,n):e},n.value=function(t){return arguments.length?(r=t,n):r},n.revalue=function(t){return r&&(iu(t,function(n){n.children&&(n.value=0)}),au(t,function(t){var e;t.children||(t.value=+r.call(n,t,t.depth)||0),(e=t.parent)&&(e.value+=t.value)})),t},n},oa.layout.partition=function(){function n(t,e,r,u){var i=t.children;if(t.x=e,t.y=t.depth*u,t.dx=r,t.dy=u,i&&(a=i.length)){var a,o,l,c=-1;for(r=t.value?r/t.value:0;++cf?-1:1),p=oa.sum(c),v=p?(f-l*g)/p:0,d=oa.range(l),m=[];return null!=e&&d.sort(e===xl?function(n,t){return c[t]-c[n]}:function(n,t){return e(a[n],a[t])}),d.forEach(function(n){m[n]={data:a[n],value:o=c[n],startAngle:s,endAngle:s+=o*v+g,padAngle:h}}),m}var t=Number,e=xl,r=0,u=Ua,i=0;return n.value=function(e){return arguments.length?(t=e,n):t},n.sort=function(t){return arguments.length?(e=t,n):e},n.startAngle=function(t){return arguments.length?(r=t,n):r},n.endAngle=function(t){return arguments.length?(u=t,n):u},n.padAngle=function(t){return arguments.length?(i=t,n):i},n};var xl={};oa.layout.stack=function(){function n(o,l){if(!(h=o.length))return o;var c=o.map(function(e,r){return t.call(n,e,r)}),s=c.map(function(t){return t.map(function(t,e){return[i.call(n,t,e),a.call(n,t,e)]})}),f=e.call(n,s,l);c=oa.permute(c,f),s=oa.permute(s,f);var h,g,p,v,d=r.call(n,s,l),m=c[0].length;for(p=0;m>p;++p)for(u.call(n,c[0][p],v=d[p],s[0][p][1]),g=1;h>g;++g)u.call(n,c[g][p],v+=s[g-1][p][1],s[g][p][1]);return o}var t=y,e=pu,r=vu,u=gu,i=fu,a=hu;return n.values=function(e){return arguments.length?(t=e,n):t},n.order=function(t){return arguments.length?(e="function"==typeof t?t:bl.get(t)||pu,n):e},n.offset=function(t){return arguments.length?(r="function"==typeof t?t:_l.get(t)||vu,n):r},n.x=function(t){return arguments.length?(i=t,n):i},n.y=function(t){return arguments.length?(a=t,n):a},n.out=function(t){return arguments.length?(u=t,n):u},n};var bl=oa.map({"inside-out":function(n){var t,e,r=n.length,u=n.map(du),i=n.map(mu),a=oa.range(r).sort(function(n,t){return u[n]-u[t]}),o=0,l=0,c=[],s=[];for(t=0;r>t;++t)e=a[t],l>o?(o+=i[e],c.push(e)):(l+=i[e],s.push(e));return s.reverse().concat(c)},reverse:function(n){return oa.range(n.length).reverse()},"default":pu}),_l=oa.map({silhouette:function(n){var t,e,r,u=n.length,i=n[0].length,a=[],o=0,l=[];for(e=0;i>e;++e){for(t=0,r=0;u>t;t++)r+=n[t][e][1];r>o&&(o=r),a.push(r)}for(e=0;i>e;++e)l[e]=(o-a[e])/2;return l},wiggle:function(n){var t,e,r,u,i,a,o,l,c,s=n.length,f=n[0],h=f.length,g=[];for(g[0]=l=c=0,e=1;h>e;++e){for(t=0,u=0;s>t;++t)u+=n[t][e][1];for(t=0,i=0,o=f[e][0]-f[e-1][0];s>t;++t){for(r=0,a=(n[t][e][1]-n[t][e-1][1])/(2*o);t>r;++r)a+=(n[r][e][1]-n[r][e-1][1])/o;i+=a*n[t][e][1]}g[e]=l-=u?i/u*o:0,c>l&&(c=l)}for(e=0;h>e;++e)g[e]-=c;return g},expand:function(n){var t,e,r,u=n.length,i=n[0].length,a=1/u,o=[];for(e=0;i>e;++e){for(t=0,r=0;u>t;t++)r+=n[t][e][1];if(r)for(t=0;u>t;t++)n[t][e][1]/=r;else for(t=0;u>t;t++)n[t][e][1]=a}for(e=0;i>e;++e)o[e]=0;return o},zero:vu});oa.layout.histogram=function(){function n(n,i){for(var a,o,l=[],c=n.map(e,this),s=r.call(this,c,i),f=u.call(this,s,c,i),i=-1,h=c.length,g=f.length-1,p=t?1:1/h;++iVous êtes identifié grâce à FranceConnect
';
- access.appendChild(createAboutLink());
- access.appendChild(document.createElement('hr'));
- access.appendChild(createHistoryLink());
- access.appendChild(createLogoutElement(logoutUrl));
- return access;
- }
-
- function createHistoryLink() {
-
- var historyLink = document.createElement('a');
- historyLink.target = 'fconnect-iframe';
- historyLink.href = '//' + fconnect.currentHost + fconnect.tracesUrl;
- historyLink.onclick = openFCPopin;
- historyLink.innerHTML = 'Historique des connexions/échanges de données';
-
- return historyLink;
- }
-
- function createAboutLink() {
- var aboutLink = document.createElement('a');
- aboutLink.href = fconnect.aboutUrl ? '//' + fconnect.currentHost + fconnect.aboutUrl : '#';
- if (fconnect.aboutUrl) {
- aboutLink.target = 'fconnect-iframe';
- aboutLink.onclick = openFCPopin;
- }
- aboutLink.innerHTML = 'Qu\'est-ce-que FranceConnect ?';
-
- return aboutLink;
- }
-
- function createLogoutElement(logoutUrl) {
- var elm = document.createElement('div');
- elm.className = 'logout';
- elm.innerHTML = 'Se déconnecter';
- return elm;
- }
-
- var eventMethod = window.addEventListener ? "addEventListener" : "attachEvent";
- var eventer = window[eventMethod];
- var messageEvent = eventMethod == "attachEvent" ? "onmessage" : "message";
-
- // Listen to message from child window
- eventer(messageEvent, function (e) {
- var key = e.message ? "message" : "data";
- var data = e[key];
- if (data === 'close_popup') {
- closeFCPopin(e);
- }
- }, false);
-})(this);
diff --git a/vendor/assets/javascripts/leaflet.1.1.0.js b/vendor/assets/javascripts/leaflet.1.1.0.js
deleted file mode 100644
index 4c4b8a63d..000000000
--- a/vendor/assets/javascripts/leaflet.1.1.0.js
+++ /dev/null
@@ -1,6 +0,0 @@
-!function(t,i){"object"==typeof exports&&"undefined"!=typeof module?i(exports):"function"==typeof define&&define.amd?define(["exports"],i):i(t.L=t.L||{})}(this,function(t){"use strict";function i(t){var i,e,n,o;for(e=1,n=arguments.length;ei&&(e.push(t[n]),o=n);return ot.y!=n.y>t.y&&t.x<(n.x-e.x)*(t.y-e.y)/(n.y-e.y)+e.x&&(u=!u);return u||vn.prototype._containsPoint.call(this,t,!0)}}),xn=un.extend({initialize:function(t,i){l(this,i),this._layers={},t&&this.addData(t)},addData:function(t){var i,e,n,o=mi(t)?t:t.features;if(o){for(i=0,e=o.length;i