many misc bug fix

composer.json

@@ -133,6 +133,9 @@
             "drupal/login_emailusername": {
               "rest login email or user name https://www.drupal.org/project/login_emailusername/issues/2910511#comment-12564801" : "https://www.drupal.org/files/issues/2018-04-10/allow-rest-login-with-email-2910511-9.patch",
               "Flood service is undefined https://www.drupal.org/project/login_emailusername/issues/3276966" : "https://www.drupal.org/files/issues/2024-09-30/login_emailusername_issues_3276966_%2312.patch"
+            },
+            "drupal/date_range_formatter":{
+                "Passing empty value to t() when same day + time for start and end date https://www.drupal.org/project/date_range_formatter/issues/3309324":"https://www.drupal.org/files/issues/2024-10-10/date_range_formatter_3309324_%2330.patch"
             }
         },
         "old-patches": {

patches/date_range_formatter_3309324_#30.patch

@@ -0,0 +1,13 @@
+diff --git a/src/Plugin/Field/FieldFormatter/DateRangeFormatterRangeFormatter.php b/src/Plugin/Field/FieldFormatter/DateRangeFormatterRangeFormatter.php
+index 92ec640..4e843f0 100644
+--- a/src/Plugin/Field/FieldFormatter/DateRangeFormatterRangeFormatter.php
++++ b/src/Plugin/Field/FieldFormatter/DateRangeFormatterRangeFormatter.php
+@@ -79,7 +79,7 @@ class DateRangeFormatterRangeFormatter extends DateTimeCustomFormatter {
+         }
+         if (!array_key_exists($delta, $elements)) {
+           // No end date provided or end date equals start date use single formatting.
+-          $single_format = $this->getSetting('single');
++          $single_format = $this->getSetting('one_day');
+           $elements[$delta] = ['#markup' => \Drupal::service('date.formatter')->format($start_date, 'custom', $this->t($single_format))];
+         }
+       }

web/modules/custom/edlp_ajax/src/Controller/EdlpAjaxController.php

@@ -90,7 +90,7 @@ class EdlpAjaxController extends ControllerBase {
           '#items' => [],
         );
         foreach($future_nodes as $node){
-          $future_list['#items'][] = $node_view_builder->view($node, 'aside');
+          $future_list['#items'][] = $node_view_builder->view($node, 'aside', $this->langcode);
         }
         $aside['future_events'] = array(
           "#type"=>"container",
@@ -109,7 +109,7 @@ class EdlpAjaxController extends ControllerBase {
           '#items' => [],
         );
         foreach($past_nodes as $node){
-          $past_list['#items'][] = $node_view_builder->view($node, 'aside');
+          $past_list['#items'][] = $node_view_builder->view($node, 'aside', $this->langcode);
         }
         $aside['past_events'] = array(
           "#type"=>"container",

web/modules/custom/edlp_corpus/assets/dist/scripts/physics.min.js

@@ -1,17 +1,19 @@
 
-require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){var _=require('./common'),Vector=require('./vector');function Attraction(a,b,k,d){this.a=a;this.b=b;this.constant=k;this.on=true;this.distanceMin=d;this.distanceMinSquared=d*d;}
-_.extend(Attraction.prototype,{update:function(){var a=this.a,b=this.b;if(!this.on||(a.fixed&&b.fixed)){return;}
-var a2bx=a.position.x-b.position.x;var a2by=a.position.y-b.position.y;var a2b=new Vector().sub(a.position,b.position);var a2bdistanceSquared=Math.max(a2b.lengthSquared(),this.distanceMinSquared);var force=(this.constant*a.mass*b.mass)/a2bdistanceSquared;var length=Math.sqrt(a2bdistanceSquared);if(force===0||length===0){a2b.clear();}else{a2b.divideScalar(length).multiplyScalar(force);}
+require=function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'");}
+var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e);},f,f.exports,e,t,n,r);}
+return n[o].exports;}
+var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s;}({1:[function(require,module,exports){var _=require('./common'),Vector=require('./vector');function Attraction(a,b,k,d){this.a=a;this.b=b;this.constant=k;this.on=true;this.distanceMin=d;this.distanceMinSquared=d*d;}
+_.extend(Attraction.prototype,{update:function(){var a=this.a,b=this.b;if(!this.on||a.fixed&&b.fixed){return;}
+var a2bx=a.position.x-b.position.x;var a2by=a.position.y-b.position.y;var a2b=new Vector().sub(a.position,b.position);var a2bdistanceSquared=Math.max(a2b.lengthSquared(),this.distanceMinSquared);var force=this.constant*a.mass*b.mass/a2bdistanceSquared;var length=Math.sqrt(a2bdistanceSquared);if(force===0||length===0){a2b.clear();}else{a2b.divideScalar(length).multiplyScalar(force);}
 if(!a.fixed){a.force.subSelf(a2b);}
 if(!b.fixed){b.force.addSelf(a2b);}
-return this;},resting:function(){var a=this.a;var b=this.b;var l=this.distanceMin;return!this.on||(a.fixed&&b.fixed)||(a.fixed&&b.position.distanceTo(a.position)<=l&&b.resting())||(b.fixed&&a.position.distanceTo(b.position)<=l&&a.resting());}});module.exports=Attraction;},{"./common":8,"./vector":12}],2:[function(require,module,exports){var _=require('./common'),Vector=require('./vector');function Integrator(s){this.s=s;this.originalPositions=[];this.originalVelocities=[];this.k1Forces=[];this.k1Velocities=[];this.k2Forces=[];this.k2Velocities=[];this.k3Forces=[];this.k3Velocities=[];this.k4Forces=[];this.k4Velocities=[];}
+return this;},resting:function(){var a=this.a;var b=this.b;var l=this.distanceMin;return!this.on||a.fixed&&b.fixed||a.fixed&&b.position.distanceTo(a.position)<=l&&b.resting()||b.fixed&&a.position.distanceTo(b.position)<=l&&a.resting();}});module.exports=Attraction;},{"./common":8,"./vector":12}],2:[function(require,module,exports){var _=require('./common'),Vector=require('./vector');function Integrator(s){this.s=s;this.originalPositions=[];this.originalVelocities=[];this.k1Forces=[];this.k1Velocities=[];this.k2Forces=[];this.k2Velocities=[];this.k3Forces=[];this.k3Velocities=[];this.k4Forces=[];this.k4Velocities=[];}
 _.extend(Integrator.prototype,{allocateParticles:function(){while(this.s.particles.length>this.originalPositions.length){this.originalPositions.push(new Vector());this.originalVelocities.push(new Vector());this.k1Forces.push(new Vector());this.k1Velocities.push(new Vector());this.k2Forces.push(new Vector());this.k2Velocities.push(new Vector());this.k3Forces.push(new Vector());this.k3Velocities.push(new Vector());this.k4Forces.push(new Vector());this.k4Velocities.push(new Vector());}
 return this;},step:function(dt){var s=this.s;var p,x,y;this.allocateParticles();_.each(s.particles,function(p,i){if(!p.fixed){this.originalPositions[i].copy(p.position);this.originalVelocities[i].copy(p.velocity);}
 p.force.clear();},this);s.applyForces();_.each(s.particles,function(p,i){if(!p.fixed){this.k1Forces[i].copy(p.force);this.k1Velocities[i].copy(p.velocity);}
 p.force.clear();},this);_.each(s.particles,function(p,i){if(!p.fixed){var op=this.originalPositions[i];var k1v=this.k1Velocities[i];x=op.x+k1v.x*0.5*dt;y=op.y+k1v.y*0.5*dt;p.position.set(x,y);var ov=this.originalVelocities[i];var k1f=this.k1Forces[i];x=ov.x+k1f.x*0.5*dt/p.mass;y=ov.y+k1f.y*0.5*dt/p.mass;p.velocity.set(x,y);}},this);s.applyForces();_.each(s.particles,function(p,i){if(!p.fixed){this.k2Forces[i].copy(p.force);this.k2Velocities[i].copy(p.velocity);}
 p.force.clear();},this);_.each(s.particles,function(p,i){if(!p.fixed){var op=this.originalPositions[i];var k2v=this.k2Velocities[i];p.position.set(op.x+k2v.x*0.5*dt,op.y+k2v.y*0.5*dt);var ov=this.originalVelocities[i];var k2f=this.k2Forces[i];p.velocity.set(ov.x+k2f.x*0.5*dt/p.mass,ov.y+k2f.y*0.5*dt/p.mass);}},this);s.applyForces();_.each(s.particles,function(p,i){if(!p.fixed){this.k3Forces[i].copy(p.force);this.k3Velocities[i].copy(p.velocity);}
-p.force.clear();},this);_.each(s.particles,function(p,i){if(!p.fixed){var op=this.originalPositions[i];var k3v=this.k3Velocities[i];p.position.set(op.x+k3v.x*dt,op.y+k3v.y*dt)
-var ov=this.originalVelocities[i];var k3f=this.k3Forces[i];p.velocity.set(ov.x+k3f.x*dt/p.mass,ov.y+k3f.y*dt/p.mass);}},this);s.applyForces();_.each(s.particles,function(p,i){if(!p.fixed){this.k4Forces[i].copy(p.force);this.k4Velocities[i].copy(p.velocity);}},this);_.each(s.particles,function(p,i){p.age+=dt;if(!p.fixed){var op=this.originalPositions[i];var k1v=this.k1Velocities[i];var k2v=this.k2Velocities[i];var k3v=this.k3Velocities[i];var k4v=this.k4Velocities[i];var x=op.x+dt/6.0*(k1v.x+2.0*k2v.x+2.0*k3v.x+k4v.x);var y=op.y+dt/6.0*(k1v.y+2.0*k2v.y+2.0*k3v.y+k4v.y);p.position.set(x,y);var ov=this.originalVelocities[i];var k1f=this.k1Forces[i];var k2f=this.k2Forces[i];var k3f=this.k3Forces[i];var k4f=this.k4Forces[i];x=ov.x+dt/(6.0*p.mass)*(k1f.x+2.0*k2f.x+2.0*k3f.x+k4f.x);y=ov.y+dt/(6.0*p.mass)*(k1f.y+2.0*k2f.y+2.0*k3f.y+k4f.y);p.velocity.set(x,y);}},this);return this;}});module.exports=Integrator;},{"./common":8,"./vector":12}],3:[function(require,module,exports){var _=require('./common'),Vector=require('./vector');function Particle(mass){this.position=new Vector();this.velocity=new Vector();this.force=new Vector();this.mass=mass;this.fixed=false;this.age=0;this.dead=false;}
+p.force.clear();},this);_.each(s.particles,function(p,i){if(!p.fixed){var op=this.originalPositions[i];var k3v=this.k3Velocities[i];p.position.set(op.x+k3v.x*dt,op.y+k3v.y*dt);var ov=this.originalVelocities[i];var k3f=this.k3Forces[i];p.velocity.set(ov.x+k3f.x*dt/p.mass,ov.y+k3f.y*dt/p.mass);}},this);s.applyForces();_.each(s.particles,function(p,i){if(!p.fixed){this.k4Forces[i].copy(p.force);this.k4Velocities[i].copy(p.velocity);}},this);_.each(s.particles,function(p,i){p.age+=dt;if(!p.fixed){var op=this.originalPositions[i];var k1v=this.k1Velocities[i];var k2v=this.k2Velocities[i];var k3v=this.k3Velocities[i];var k4v=this.k4Velocities[i];var x=op.x+dt/6.0*(k1v.x+2.0*k2v.x+2.0*k3v.x+k4v.x);var y=op.y+dt/6.0*(k1v.y+2.0*k2v.y+2.0*k3v.y+k4v.y);p.position.set(x,y);var ov=this.originalVelocities[i];var k1f=this.k1Forces[i];var k2f=this.k2Forces[i];var k3f=this.k3Forces[i];var k4f=this.k4Forces[i];x=ov.x+dt/(6.0*p.mass)*(k1f.x+2.0*k2f.x+2.0*k3f.x+k4f.x);y=ov.y+dt/(6.0*p.mass)*(k1f.y+2.0*k2f.y+2.0*k3f.y+k4f.y);p.velocity.set(x,y);}},this);return this;}});module.exports=Integrator;},{"./common":8,"./vector":12}],3:[function(require,module,exports){var _=require('./common'),Vector=require('./vector');function Particle(mass){this.position=new Vector();this.velocity=new Vector();this.force=new Vector();this.mass=mass;this.fixed=false;this.age=0;this.dead=false;}
 _.extend(Particle.prototype,{distanceTo:function(p){return this.position.distanceTo(p.position);},makeFixed:function(){this.fixed=true;this.velocity.clear();return this;},reset:function(){this.age=0;this.dead=false;this.position.clear();this.velocity.clear();this.force.clear();this.mass=1.0;return this;},resting:function(){return this.fixed||this.velocity.isZero()&&this.force.isZero();}});module.exports=Particle;},{"./common":8,"./vector":12}],4:[function(require,module,exports){var _=require('./common'),Vector=require('./Vector'),Particle=require('./Particle'),Spring=require('./Spring'),Attraction=require('./Attraction'),Integrator=require('./Integrator');function ParticleSystem(){this.__equilibriumCriteria={particles:true,springs:true,attractions:true};this.__equilibrium=false;this.__optimized=false;this.particles=[];this.springs=[];this.attractions=[];this.forces=[];this.integrator=new Integrator(this);this.hasDeadParticles=false;var args=arguments.length;if(args===1){this.gravity=new Vector(0,arguments[0]);this.drag=ParticleSystem.DEFAULT_DRAG;}else if(args===2){this.gravity=new Vector(0,arguments[0]);this.drag=arguments[1];}else if(args===3){this.gravity=new Vector(arguments[0],arguments[1]);this.drag=arguments[3];}else{this.gravity=new Vector(0,ParticleSystem.DEFAULT_GRAVITY);this.drag=ParticleSystem.DEFAULT_DRAG;}}
 _.extend(ParticleSystem,{DEFAULT_GRAVITY:0,DEFAULT_DRAG:0.001,Attraction:Attraction,Integrator:Integrator,Particle:Particle,Spring:Spring,Vector:Vector});_.extend(ParticleSystem.prototype,{optimize:function(b){this.__optimized=!!b;return this;},setGravity:function(x,y){this.gravity.set(x,y);return this;},setEquilibriumCriteria:function(particles,springs,attractions){this.__equilibriumCriteria.particles=!!particles;this.__equilibriumCriteria.springs=!!springs;this.__equilibriumCriteria.attractions=!!attractions;},tick:function(){this.integrator.step(arguments.length===0?1:arguments[0]);if(this.__optimized){this.__equilibrium=!this.needsUpdate();}
 return this;},needsUpdate:function(){var i=0;if(this.__equilibriumCriteria.particles){for(i=0,l=this.particles.length;i<l;i++){if(!this.particles[i].resting()){return true;}}}
@@ -31,8 +33,8 @@ module.exports=Physics;},{"./ParticleSystem":4,"./common":8,"./requestAnimationF
 _.extend(Spring.prototype,{currentLength:function(){return this.a.position.distanceTo(this.b.position);},update:function(){var a=this.a;var b=this.b;if(!(this.on&&(!a.fixed||!b.fixed)))return this;var a2b=new Vector().sub(a.position,b.position);var d=a2b.length();if(d===0){a2b.clear();}else{a2b.divideScalar(d);}
 var fspring=-1*(d-this.length)*this.constant;var va2b=new Vector().sub(a.velocity,b.velocity);var fdamping=-1*this.damping*va2b.dot(a2b);var fr=fspring+fdamping;a2b.multiplyScalar(fr);if(!a.fixed){a.force.addSelf(a2b);}
 if(!b.fixed){b.force.subSelf(a2b);}
-return this;},resting:function(){var a=this.a;var b=this.b;var l=this.length;return!this.on||(a.fixed&&b.fixed)||(a.fixed&&(l===0?b.position.equals(a.position):b.position.distanceTo(a.position)<=l)&&b.resting())||(b.fixed&&(l===0?a.position.equals(b.position):a.position.distanceTo(b.position)<=l)&&a.resting());}});module.exports=Spring;},{"./common":8,"./vector":12}],7:[function(require,module,exports){var _=require('./common');function Vector(x,y){this.x=x||0;this.y=y||0;}
+return this;},resting:function(){var a=this.a;var b=this.b;var l=this.length;return!this.on||a.fixed&&b.fixed||a.fixed&&(l===0?b.position.equals(a.position):b.position.distanceTo(a.position)<=l)&&b.resting()||b.fixed&&(l===0?a.position.equals(b.position):a.position.distanceTo(b.position)<=l)&&a.resting();}});module.exports=Spring;},{"./common":8,"./vector":12}],7:[function(require,module,exports){var _=require('./common');function Vector(x,y){this.x=x||0;this.y=y||0;}
 _.extend(Vector.prototype,{set:function(x,y){this.x=x;this.y=y;return this;},copy:function(v){this.x=v.x;this.y=v.y;return this;},clear:function(){this.x=0;this.y=0;return this;},clone:function(){return new Vector(this.x,this.y);},add:function(v1,v2){this.x=v1.x+v2.x;this.y=v1.y+v2.y;return this;},addSelf:function(v){this.x+=v.x;this.y+=v.y;return this;},sub:function(v1,v2){this.x=v1.x-v2.x;this.y=v1.y-v2.y;return this;},subSelf:function(v){this.x-=v.x;this.y-=v.y;return this;},multiplySelf:function(v){this.x*=v.x;this.y*=v.y;return this;},multiplyScalar:function(s){this.x*=s;this.y*=s;return this;},multiplyScalarXY:function(sx,sy){this.x*=sx;this.y*=sy;return this;},divideScalar:function(s){if(s){this.x/=s;this.y/=s;}else{this.set(0,0);}
-return this;},negate:function(){return this.multiplyScalar(-1);},dot:function(v){return this.x*v.x+this.y*v.y;},lengthSquared:function(){return this.x*this.x+this.y*this.y;},length:function(){return Math.sqrt(this.lengthSquared());},normalize:function(){return this.divideScalar(this.length());},distanceTo:function(v){return Math.sqrt(this.distanceToSquared(v));},distanceToSquared:function(v){var dx=this.x-v.x,dy=this.y-v.y;return dx*dx+dy*dy;},setLength:function(l){return this.normalize().multiplyScalar(l);},equals:function(v){return(this.distanceTo(v)<0.0001);},lerp:function(v,t){var x=(v.x-this.x)*t+this.x;var y=(v.y-this.y)*t+this.y;return this.set(x,y);},isZero:function(){return(this.length()<0.0001);}});module.exports=Vector;},{"./common":8}],8:[function(require,module,exports){var breaker={};var ArrayProto=Array.prototype;var ObjProto=Object.prototype;var hasOwnProperty=ObjProto.hasOwnProperty;var slice=ArrayProto.slice;var nativeForEach=ArrayProto.forEach;var nativeIndexOf=ArrayProto.indexOf;var toString=ObjProto.toString;var has=function(obj,key){return hasOwnProperty.call(obj,key);};var each=function(obj,iterator,context){if(obj==null)return;if(nativeForEach&&obj.forEach===nativeForEach){obj.forEach(iterator,context);}else if(obj.length===+obj.length){for(var i=0,l=obj.length;i<l;i++){if(i in obj&&iterator.call(context,obj[i],i,obj)===breaker)return;}}else{for(var key in obj){if(_.has(obj,key)){if(iterator.call(context,obj[key],key,obj)===breaker)return;}}}};var identity=function(value){return value;};var sortedIndex=function(array,obj,iterator){iterator||(iterator=identity);var low=0,high=array.length;while(low<high){var mid=(low+high)>>1;iterator(array[mid])<iterator(obj)?low=mid+1:high=mid;}
+return this;},negate:function(){return this.multiplyScalar(-1);},dot:function(v){return this.x*v.x+this.y*v.y;},lengthSquared:function(){return this.x*this.x+this.y*this.y;},length:function(){return Math.sqrt(this.lengthSquared());},normalize:function(){return this.divideScalar(this.length());},distanceTo:function(v){return Math.sqrt(this.distanceToSquared(v));},distanceToSquared:function(v){var dx=this.x-v.x,dy=this.y-v.y;return dx*dx+dy*dy;},setLength:function(l){return this.normalize().multiplyScalar(l);},equals:function(v){return this.distanceTo(v)<0.0001;},lerp:function(v,t){var x=(v.x-this.x)*t+this.x;var y=(v.y-this.y)*t+this.y;return this.set(x,y);},isZero:function(){return this.length()<0.0001;}});module.exports=Vector;},{"./common":8}],8:[function(require,module,exports){var breaker={};var ArrayProto=Array.prototype;var ObjProto=Object.prototype;var hasOwnProperty=ObjProto.hasOwnProperty;var slice=ArrayProto.slice;var nativeForEach=ArrayProto.forEach;var nativeIndexOf=ArrayProto.indexOf;var toString=ObjProto.toString;var has=function(obj,key){return hasOwnProperty.call(obj,key);};var each=function(obj,iterator,context){if(obj==null)return;if(nativeForEach&&obj.forEach===nativeForEach){obj.forEach(iterator,context);}else if(obj.length===+obj.length){for(var i=0,l=obj.length;i<l;i++){if(i in obj&&iterator.call(context,obj[i],i,obj)===breaker)return;}}else{for(var key in obj){if(_.has(obj,key)){if(iterator.call(context,obj[key],key,obj)===breaker)return;}}}};var identity=function(value){return value;};var sortedIndex=function(array,obj,iterator){iterator||(iterator=identity);var low=0,high=array.length;while(low<high){var mid=low+high>>1;iterator(array[mid])<iterator(obj)?low=mid+1:high=mid;}
 return low;};module.exports={has:has,each:each,extend:function(obj){each(slice.call(arguments,1),function(source){for(var prop in source){obj[prop]=source[prop];}});return obj;},indexOf:function(array,item,isSorted){if(array==null)return-1;var i,l;if(isSorted){i=sortedIndex(array,item);return array[i]===item?i:-1;}
-if(nativeIndexOf&&array.indexOf===nativeIndexOf)return array.indexOf(item);for(i=0,l=array.length;i<l;i++)if(i in array&&array[i]===item)return i;return-1;},sortedIndex:sortedIndex,identity:identity,isNumber:function(obj){return toString.call(obj)=='[object Number]';},isFunction:function(obj){return toString.call(obj)=='[object Function]'||typeof obj=='function';},isUndefined:function(obj){return obj===void 0;},isNull:function(obj){return obj===null;}};},{}],"H99CHA":[function(require,module,exports){var root=(function(){return this;})(),previousShortcut=root.Physics;module.exports=root.Physics=require('./Physics');},{"./Physics":5}],"physics":[function(require,module,exports){module.exports=require('H99CHA');},{}],11:[function(require,module,exports){module.exports=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(callback){window.setTimeout(callback,1000/60);};},{}],12:[function(require,module,exports){module.exports=require(7)},{"./common":8}]},{},["H99CHA"])
+if(nativeIndexOf&&array.indexOf===nativeIndexOf)return array.indexOf(item);for(i=0,l=array.length;i<l;i++)if(i in array&&array[i]===item)return i;return-1;},sortedIndex:sortedIndex,identity:identity,isNumber:function(obj){return toString.call(obj)=='[object Number]';},isFunction:function(obj){return toString.call(obj)=='[object Function]'||typeof obj=='function';},isUndefined:function(obj){return obj===void 0;},isNull:function(obj){return obj===null;}};},{}],"H99CHA":[function(require,module,exports){var root=function(){return this;}(),previousShortcut=root.Physics;module.exports=root.Physics=require('./Physics');},{"./Physics":5}],"physics":[function(require,module,exports){module.exports=require('H99CHA');},{}],11:[function(require,module,exports){module.exports=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(callback){window.setTimeout(callback,1000/60);};},{}],12:[function(require,module,exports){module.exports=require(7);},{"./common":8}]},{},["H99CHA"]);

web/modules/custom/edlp_corpus/assets/dist/styles/corpus.min.css

@@ -1 +1 @@
-canvas#corpus-map{position:absolute;box-sizing:border-box;top:0;left:0;z-index:0}canvas#corpus-map.de-activated{background-color:#f4f4f4}div.node-popup{z-index:10;position:absolute;box-sizing:content-box;width:300px;min-height:30px;top:60%;left:30%;pointer-events:none}div.node-popup .inner{padding:.6em;outline:red solid 1px;background-color:#fff}div.node-popup:before{content:"";position:absolute;width:60px;height:0;border-top:1px solid red}div.node-popup[pos=bottom-right]{transform:translateY(42px) translateX(42px)}div.node-popup[pos=bottom-right]:before{top:-1px;left:-61px;transform-origin:bottom right;transform:rotateZ(45deg)}div.node-popup[pos=bottom-left]{transform:translateX(-100%) translateY(42px) translateX(-42px)}div.node-popup[pos=bottom-left]:before{top:calc(100% +1px);left:100%;transform-origin:top left;transform:rotateZ(-45deg)}div.node-popup[pos=top-left]{transform:translateY(-100%) translateX(-100%) translateY(-42px) translateX(-42px)}div.node-popup[pos=top-left]:before{bottom:0;left:100%;transform-origin:top left;transform:rotateZ(45deg)}div.node-popup[pos=top-right]{transform:translateY(-100%) translateY(-42px) translateX(42px)}div.node-popup[pos=top-right]:before{top:calc(100% + 1px);left:-61px;transform-origin:top right;transform:rotateZ(-45deg)}
+canvas#corpus-map{position:absolute;box-sizing:border-box;top:0;left:0;z-index:0}canvas#corpus-map.de-activated{background-color:#f4f4f4}div.node-popup{z-index:10;position:absolute;box-sizing:content-box;width:300px;min-height:30px;top:60%;left:30%;pointer-events:none}div.node-popup .inner{padding:.6em;outline:red solid 1px;background-color:#fff}div.node-popup:before{content:"";position:absolute;width:60px;height:0;border-top:1px solid red}div.node-popup[pos=bottom-right]{transform:translateY(42px) translateX(42px)}div.node-popup[pos=bottom-right]:before{top:-1px;left:-61px;transform-origin:bottom right;transform:rotateZ(45deg)}div.node-popup[pos=bottom-left]{transform:translateX(-100%) translateY(42px) translateX(-42px)}div.node-popup[pos=bottom-left]:before{top:calc(100% + 1px);left:100%;transform-origin:top left;transform:rotateZ(-45deg)}div.node-popup[pos=top-left]{transform:translateY(-100%) translateX(-100%) translateY(-42px) translateX(-42px)}div.node-popup[pos=top-left]:before{bottom:0;left:100%;transform-origin:top left;transform:rotateZ(45deg)}div.node-popup[pos=top-right]{transform:translateY(-100%) translateY(-42px) translateX(42px)}div.node-popup[pos=top-right]:before{top:calc(100% + 1px);left:-61px;transform-origin:top right;transform:rotateZ(-45deg)}

web/modules/custom/edlp_corpus/assets/styles/corpus.scss

@@ -1,23 +1,16 @@
-// @Author: Bachir Soussi Chiadmi <bach>
-// @Date:   18-12-2017
-// @Email:  bachir@figureslibres.io
-// @Filename: corpus.scss
-// @Last modified by:   bach
-// @Last modified time: 20-12-2017
-// @License: GPL-V3
-
 canvas#corpus-map{
-  &.de-activated{
-    background-color: rgb(244, 244, 244);
-  }
   position: absolute;
   box-sizing: border-box;
   top:0; left:0;
   // width:100%; height:100%;
   z-index:0;
+  &.de-activated{
+    background-color: rgb(244, 244, 244);
+  }
 }
 
 
+
 //  _  _         _     ___          _   _
 // | \| |___  __| |___| _ \___ _ __| | | |_ __
 // | .` / _ \/ _` / -_)  _/ _ \ '_ \ |_| | '_ \
@@ -40,7 +33,7 @@ div.node-popup{
   }
 
   $w:60px; // diagonal length
-  $s:($w *1.4)*0.5; // side given the diagonal (1.4 is the square root of 2)
+  $s:($w * 1.4) * 0.5; // side given the diagonal (1.4 is the square root of 2)
   &:before{
     content:"";
     position: absolute;
@@ -60,7 +53,7 @@ div.node-popup{
   &[pos="bottom-left"]{
     transform: translateX(-100%) translateY($s) translateX(-$s);
     &:before{
-      top:calc(100% +1px);
+      top:calc(100% + 1px);
       left: 100%;
       transform-origin: top left;
       transform: rotateZ(-45deg);
@@ -79,9 +72,10 @@ div.node-popup{
     transform: translateY(-100%) translateY(-$s) translateX($s);
     &:before{
       top:calc(100% + 1px);
-      left: - ($w +1px);
+      left: - ($w + 1px);
       transform-origin: top right;
       transform: rotateZ(-45deg);
     }
   }
 }
+

web/modules/custom/edlp_studio/assets/scripts/edlp_studio.js

@@ -305,6 +305,7 @@
 
   }
 
+
   //  ___                  __       ___                 _   _ ___
   // |   \ _ _ __ _ __ _  / _|___  |   \ _ _ ___ _ __  | | | |_ _|
   // | |) | '_/ _` / _` | > _|_ _| | |) | '_/ _ \ '_ \ | |_| || |

web/modules/custom/edlp_studio/edlp_studio.libraries.yml

@@ -5,7 +5,7 @@ edlp_studio-library:
     - core/drupalSettings
     - core/once
     - core/jquery
+    - jquery_ui_draggable/draggable
+    - jquery_ui_droppable/droppable
+    - jquery_ui_sortable/sortable
     # - core/jquery.once
-    - jquery_ui_draggable/jquery_ui_draggable
-    - jquery_ui_droppable/jquery_ui_droppable
-    - jquery_ui_sortable/jquery_ui_sortable

web/modules/custom/edlp_studio/includes/composition.inc

@@ -26,7 +26,7 @@ function template_preprocess_composition(array &$vars) {
 
   // $variables['page'] = $variables['view_mode'] == 'full' && taxonomy_term_is_page($term);
 
-  $vars['url'] = $composition->url();
+  $vars['url'] = $composition->toUrl()->toString();
 
   $vars['attributes']['cid'] = $composition->id();
   $vars['attributes']['class'] = array('composition');

web/modules/custom/edlp_studio/src/Controller/CompositionController.php

@@ -73,7 +73,7 @@ class CompositionController extends ControllerBase {
       case 'save':
         if($cid){
           $name = $request->query->get('new_name');
-          $documents = $request->query->get('documents');
+          $documents = $request->query->all('documents');
           $this->saveComposition($cid, $name, $documents);
         }else{
           $this->error_message = t("Composition saving needs a cid as query paramater!");

web/modules/custom/gulpfile.mjs

@@ -15,12 +15,25 @@ import minimist from 'minimist';
 
 // var es = require('event-stream');
 
-var modules = ['edlp_corpus', 'edlp_studio', 'edlp_search'];
+var modules = [
+  {
+    modname:'edlp_studio',
+    srcjs:['./edlp_studio/assets/scripts/edlp_studio.js']
+  }, 
+  {
+    modname:'edlp_search',
+    srcjs:['./edlp_search/assets/scripts/edlp_search.js']
+  },
+  {
+    modname:'edlp_corpus',
+    srcjs:['./edlp_corpus/assets/scripts/corpus.js', './edlp_corpus/assets/scripts/physics.js'],
+    srccss:['./edlp_corpus/assets/styles/corpus.scss']
+  }]; 
 
 // to get minified assets run `gulp --env=prod`
 var argv = minimist(process.argv.slice(2));
 console.dir(argv);
-var prod = argv.env == 'prod' ? true : false;
+var prod = argv.env === 'prod' ? true : false;
 
 function handleError(err) {
   console.log(err.toString());
@@ -29,46 +42,70 @@ function handleError(err) {
 function scripts() {
   return new Promise(function(resolve, reject) {
     modules.map(function(module) {
-      src('./'+module+'/assets/scripts/*.js')
+      // console.log('module', module);
+      
+      src(module.srcjs, {allowEmpty: true})
+        .on('data', function(file) {
+          console.log('File src:', file.path);
+        })
         .pipe(gulpif(prod, stripDebug()))
         .pipe(gulpif(prod, jsmin()))
         .pipe(rename({suffix: '.min'}))
-        .pipe(gulp.dest('./'+module+'/assets/dist/scripts/'));
+        .pipe(dest(`./${module.modname}/assets/dist/scripts/`));
+        // .on('data', function(file) {
+        //   console.log('File dest:', file.path);
+        // });
     });
     resolve();
   });
+  // return src(['./edlp_studio/assets/scripts/edlp_studio.js'])
+  //       .pipe(gulpif(prod, stripDebug()))
+  //       .pipe(gulpif(prod, jsmin()))
+  //       .pipe(rename({suffix: '.min'}))
+  //       .pipe(dest('./edlp_studio/assets/dist/scripts/'));
 };
 
 function styles() {
   return new Promise(function(resolve, reject) {
     modules.map(function(module) {
-      src('./'+module+'/assets/styles/*.scss')
-        .pipe(sass().on('error', sass.logError))
-        .pipe(autoprefixer({
-            cascade: false
-        })).on('error', handleError)
-        .pipe(gulpif(prod, cssmin()))
-        // .pipe(cssmin())
-        .pipe(rename({suffix: '.min'}))
-        .pipe(gulp.dest('./'+module+'/assets/dist/styles/'));
+      if (module.srccss) {
+        src(module.srccss, {allowEmpty: true})
+          .pipe(sass().on('error', sass.logError))
+          .pipe(autoprefixer({
+              cascade: false
+          })).on('error', handleError)
+          .pipe(gulpif(prod, cssmin()))
+          // .pipe(cssmin())
+          .pipe(rename({suffix: '.min'}))
+          .pipe(dest('./'+module.modname+'/assets/dist/styles/'));
+      }
     });
     resolve();
   });
+  // return src('./edlp_studio/assets/styles/*.scss')
+  //       .pipe(sass().on('error', sass.logError))
+  //       .pipe(autoprefixer({
+  //           cascade: false
+  //       })).on('error', handleError)
+  //       .pipe(gulpif(prod, cssmin()))
+  //       // .pipe(cssmin())
+  //       .pipe(rename({suffix: '.min'}))
+  //       .pipe(dest('./edlp_studio/assets/dist/styles/'));
 };
 
 // default gulp task
 function devwatch () {
   // series(scripts, styles, done => {
     for (var i = 0; i < modules.length; i++) {
-      watch('./'+modules[i]+'/assets/styles/*.scss', styles);
-      watch('./'+modules[i]+'/assets/scripts/*.js', scripts);
+      watch('./'+modules[i].modname+'/assets/styles/*.scss', styles);
+      watch('./'+modules[i].modname+'/assets/scripts/*.js', scripts);
     }
   //   done()
   // })
 };
 
 
-export default series(scripts, styles);
+export default series(scripts, styles); //
 export { devwatch }
 
 

web/themes/custom/edlptheme/assets/dist/scripts/main.min.js

@@ -33,7 +33,7 @@ if(edlp_origin.audio_url){var node={nid:edlp_origin.entity_id,audio_url:edlp_ori
 else if(state.ajax_path){ajaxLoadContent(state);}
 if(state.entree_tid){openEntree(state.entree_tid);}
 history.replaceState(state,null,edlp_origin.url+edlp_origin.hash);window.localStorage.removeItem("edlp_origin");}else{history.replaceState({home:true},null,window.location.pathname+window.location.hash);initGrid();_$body.attr('booted','booted');}};function onHistoryPopState(e){void 0;if(e.state.home){backToFrontPage(true);}else if(e.state.audio){void 0;_audioPlayer.openDocument(e.state.node,'popstate',e.state.historic_index);if(_is_mobile){ajaxLoadContent(e.state);}}else{if(e.state.entree_tid){openEntree(e.state.entree_tid);}
-if(e.state.ajax_path){e.state.url=null;ajaxLoadContent(e.state);}}};function initAjaxLinks(){$('a','#block-mainnavigation').add('a','#block-mainnavigation-2').add('a','#block-footer.menu--footer').add('a','#block-productions').add('a','article.node:not(.node--type-enregistrement) h2.node-title').add('a','.productions-subtree').add('a','.productions-parent').add('a','.field--name-field-son').addClass('ajax-link');if(!_is_mobile){$('a.site-name','#block-edlptheme-branding').addClass('ajax-link');}
+if(e.state.ajax_path){e.state.url=null;ajaxLoadContent(e.state);}}};function initAjaxLinks(){$('a','#block-edlptheme-mainnavigation').add('a','#block-mainnavigation-2').add('a','#block-footer.menu--footer').add('a','#block-productions').add('a','article.node:not(.node--type-enregistrement) h2.node-title').add('a','.productions-subtree').add('a','.productions-parent').add('a','.field--name-field-son').addClass('ajax-link');if(!_is_mobile){$('a.site-name','#block-edlptheme-branding').addClass('ajax-link');}
 _$ajaxLinks=$('.ajax-link');activateAjaxLinks();};function activateAjaxLinks(){_$ajaxLinks.each(function(i,e){var $this=$(this);if($this.is('.ajax-enable'))return;if($this.attr('data-drupal-link-system-path')||$this.is('[type^="audio"]')){$this.on('click',onClickAjaxLink).addClass('ajax-enable');}});};function onClickAjaxLink(e){e.preventDefault();var $link=$(this);if($link.is('.is-active')&&!$link.is('.site-name'))return false;if($link.is('.audio-link')){caller=$link.parents('.lastdocs, .lastdocs-home').length?'lastdocs':null;if(!caller){caller=$link.parents('.composition_ui').length?'studio-compo':null;}
 if(caller=='studio-compo'){var index=$link.parents('.field__item').index();void 0;_compoPlayer.start(index);}else{_audioPlayer.emmit('stop-shuffle').openDocument({nid:$link.attr('nid'),audio_url:$link.attr('audio_url'),title:$link.find('.field--name-title').html()},caller);}
 return false;}

web/themes/custom/edlptheme/assets/dist/styles/app.css

@@ -1,14 +0,0 @@
-body {
-  background: white; }
-
-.btn--hollow {
-  background: red;
-  display: inline-block;
-  padding: 10px; }
-
-body, html {
-  position: relative;
-  width: 100%;
-  height: 100%;
-  font-family: Georgia, serif;
-  font-style: normal; }

web/themes/custom/edlptheme/assets/scripts/main.js

@@ -860,7 +860,7 @@
     function initAjaxLinks(){
       // console.log('initAjaxLinks');
 
-      $('a', '#block-mainnavigation')
+      $('a', '#block-edlptheme-mainnavigation')
         .add('a', '#block-mainnavigation-2')
         // .add('a', '.block.language-switcher-language-url')
         .add('a', '#block-footer.menu--footer')

web/themes/custom/edlptheme/assets/styles/app.scss

@@ -13,11 +13,11 @@
 @import 'base/fonts';
 
 @mixin spining-loader-square{
+  animation: rotation 2s infinite linear;
   @keyframes rotation {
     from {transform: rotate(0deg);}
     to   {transform: rotate(359deg);}
   }
-  animation: rotation 2s infinite linear;
 }
 
 @mixin entree-micro-square {
@@ -132,6 +132,9 @@ header[role="banner"]{
 
 #block-edlptheme-branding{
   display: inline-block;
+  opacity: 1;
+  transition: opacity 0.7s ease-in-out;
+
   h1{
     margin:0; display: inline-block;
     a.site-name{
@@ -152,15 +155,12 @@ header[role="banner"]{
       }
     }
   }
-  opacity: 1;
-  transition: opacity 0.7s ease-in-out;
-
   .audio-player-visible &{
     opacity: 0;
   }
 }
 
-#block-mainnavigation, #block-mainnavigation-2{
+#block-mainnavigation, #block-edlptheme-mainnavigation{
   float:right;
   margin-top: 25px;
   z-index: 21;
@@ -497,11 +497,11 @@ main[role="main"]{
   }
 
   .agenda{
+    text-align: center;
     .past-events{
       border-top: 1px solid red;
       margin-top: 1em;
     }
-    text-align: center;
     h3{
       @include content_titles;
     }
@@ -956,20 +956,18 @@ main[role="main"]{
   min-width:700px;
   width: calc(100% - 460px);
   // width: calc(100% - 950px);
-  @media only screen and (max-width: 1270px) {
-    width: calc(100% - 180px);
-
-
-  }
   z-index: 20;
   opacity: 0;
   pointer-events: none;
   transition: opacity 0.7s ease-in-out;
+  white-space: nowrap;
+  @media only screen and (max-width: 1270px) {
+    width: calc(100% - 180px);
+  }
   &.visible{
     opacity: 1;
     pointer-events:all;
   }
-  white-space: nowrap;
   &>*{
     display: inline-block;
     vertical-align: middle;
@@ -1041,8 +1039,8 @@ main[role="main"]{
     // background-color: white;
     opacity: 1;
     transition: opacity 0.5s ease-in-out;
-    &.loading{opacity: 0;}
     white-space: nowrap;
+    &.loading{opacity: 0;}
     .actions, .cartels{
       display: inline-block;
       vertical-align: top;
@@ -1280,7 +1278,7 @@ main[role="main"]{
       transform: translateY(-100%) translateY(-$s) translateX($s);
       &:before{
         top:calc(100% + 1px);
-        left: - ($w +1px);
+        left: - ($w + 1px);
         transform-origin: top right;
         transform: rotateZ(-45deg);
       }
@@ -1296,7 +1294,6 @@ main[role="main"]{
   }
 }
 
-
  //  ___ _           _ _
  // / __| |_ _  _ __| (_)___
  // \__ \  _| || / _` | / _ \
@@ -1314,10 +1311,10 @@ main[role="main"]{
   background-repeat: no-repeat;
   background-size: contain;
   background-image: url(../img/favori-off.svg);
+  transition: opacity 0.2s ease-in-out;
   &[action="remove"]{
     background-image: url(../img/favori-on.svg);
   }
-  transition: opacity 0.2s ease-in-out;
   &.ajax-loading{
     opacity: 0.2;
   }
@@ -1365,11 +1362,11 @@ main[role="main"]{
     // margin-right: 25px;
     width:25px;
     height: 100%;
+    opacity: 1;
+    transition: opacity 0.1s ease-in-out;
     &.ui-draggable-dragging{
       height:100px;
     }
-    opacity: 1;
-    transition: opacity 0.1s ease-in-out;
     &.ready-to-remove{
       opacity:0.3;
       cursor:crosshair;
@@ -1388,6 +1385,7 @@ main[role="main"]{
         text-transform: none;
         a{
           white-space: nowrap!important;
+          font-size: 0.756em;
           &:before{
             content:"";
             display: inline-block;
@@ -1397,7 +1395,6 @@ main[role="main"]{
             background-color: white;
             // TODO: entries color;
           }
-          font-size: 0.756em;
         }
       }
     }
@@ -1544,7 +1541,7 @@ main[role="main"]{
             display: inline-block;
             box-sizing: border-box;
             // width:100%;
-            width: calc(100% - #{$w +$s +$m +2});
+            width: calc(100% - #{$w + $s + $m + 2});
             &:before{
               content: "";
               width:$w; height:$w;
@@ -1575,23 +1572,25 @@ main[role="main"]{
           }
           &.new-composition-link{
             // padding-left: 1em;
-            &:before{
-              content:"+";
-              // font-weight: bold;
-              margin-right: $m;
-            }
             display: inline-block;
             vertical-align: top;
             overflow: hidden;
             margin-top: 0.4em;
             height:1em;
             transition: height 0.2s ease-in-out;
+            &:before{
+              content:"+";
+              // font-weight: bold;
+              margin-right: $m;
+            }
             &.folded{
               height:0;
             }
           }
         }
         .new-compo-form{
+          opacity: 1;
+          transition: opacity 0.2s ease-in-out;
           input[type="text"]{
             font-size: 0.756em;
             padding:0 0.5em;
@@ -1608,8 +1607,6 @@ main[role="main"]{
             line-height: 1;
             font-weight: bold;
           }
-          opacity: 1;
-          transition: opacity 0.2s ease-in-out;
           &.ajax-loading{
             opacity: 0.4;
           }
@@ -1661,7 +1658,7 @@ main[role="main"]{
             }
             &:before{
               border-top: 1px solid $c;
-              height:$h /2;
+              height:calc($h / 2);
             }
             &:after{
               border-left: 1px solid $c;
@@ -2096,7 +2093,6 @@ body.path-frontpage, body.path-productions{
   display: inline-block;
   position: relative;
   list-style: none;
-  margin: 0 1.5em 0 0;
   // width:2em; height:10em;
   padding: 0;
   a{
@@ -2239,6 +2235,7 @@ footer{
       padding:0;
       li{
         pointer-events: all;
+        margin: 0 1.5em 0 0;
         @include oblique-list;
         &:first-of-type{
           margin-left: 1em;
@@ -2306,11 +2303,11 @@ footer{
 
   .block-block-edlp-entrees{
     pointer-events: none;
+    display: inline-block;
     body.path-productions &,
     body.entity-type-node.bundle-page &,
     body.path-agenda & {display:none}
 
-    display: inline-block;
     // vertical-align: top;
     // outline: 1px dotted green;
     div.item-list{
@@ -2318,10 +2315,10 @@ footer{
         margin:0;
         white-space: nowrap;
         li{
-          @include oblique-list;
-          margin:0;
           white-space: nowrap;
           pointer-events: none;
+          margin:0;
+          @include oblique-list;
           // docsindex
           &:first-of-type{
             margin-right: 3.4em;
@@ -2688,8 +2685,8 @@ footer{
 
   #block-edlpsearchlinkblock{
     margin-bottom: 1em;
-    @include iconlinkblock(url(../img/search.svg), url(../img/search-active.svg));
     margin-left: 0.2em;
+    @include iconlinkblock(url(../img/search.svg), url(../img/search-active.svg));
   }
 
   .block-language{
@@ -2807,11 +2804,11 @@ footer{
       }
     }
     .chutier-icon{
+      position:absolute;
+      top:0.4em; right:0.4em;
       &[action="add"]{
         display:none;
       }
-      position:absolute;
-      top:0.4em; right:0.4em;
     }
   }
   body.domain-expo-encyclopediedelaparole-org &{

web/themes/custom/edlptheme/assets/styles/base/_grid.scss

@@ -16,7 +16,7 @@ $med-bp:1080px;
   }
 }
 
-%col-reset {
+@mixin col-reset {
     width: 100%;
     // display: inline-block;
     // white-space:normal;
@@ -26,21 +26,22 @@ $med-bp:1080px;
 }
 
 @mixin col($col, $offset: 0, $sum: $default_sum, $gap: $default_gap, $align: top) {
-  @extend %col-reset;
+  @include col-reset;
   padding-left: $gap*$offset;
   @if $col == $default_sum {
     padding-right: 0;
   }@else{
     padding-right: $gap;
   }
-  &:last-child{padding-right: 0;}
-
-  margin-left: percentage(($col/$sum)*$offset);
-
+  
+  margin-left: percentage(calc($col / $sum) * $offset);
+  
   // @media only screen and (min-width: 768px) {
-    width: percentage($col/$sum);
+    width: percentage(calc($col / $sum));
     // vertical-align: $align;
-  // }
+    // }
+
+  &:last-child{padding-right: 0;}
 }
 
 .row{
@@ -64,14 +65,14 @@ $med-bp:1080px;
 
   // medium
   .med-col-#{$c} {
-    @media only screen and (min-width: $small-bp+1) and (max-width: $med-bp) {
+    @media only screen and (min-width: $small-bp + 1) and (max-width: $med-bp) {
       @include col($c);
     }
   }
 
   // large
   .large-col-#{$c} {
-    @media only screen and (min-width: $med-bp+1) {
+    @media only screen and (min-width: $med-bp + 1) {
       @include col($c);
     }
   }

web/themes/custom/edlptheme/gulpfile.mjs

@@ -11,17 +11,16 @@ import stripDebug from 'gulp-strip-debug';
 import jsmin from 'gulp-jsmin';
 import cssmin from 'gulp-cssmin';
 import rename from 'gulp-rename';
+import minimist from 'minimist';
 import mainBowerFiles from 'main-bower-files';
 import svgmin from 'gulp-svgmin';
-import minimist from 'minimist';
 
 // var shared_variables = JSON.parse(fs.readFileSync('./assets/json/shared_variables.json'));
 
 // to get minified assets run `gulp --env=prod`
 var argv = minimist(process.argv.slice(2));
 console.dir(argv);
-// var prod = argv.env === 'prod' ? true : false;
-var prod = true;
+var prod = argv.env === 'prod' ? true : false;
 
 function handleError(err) {
   console.log(err.toString());
@@ -41,14 +40,13 @@ async function styles() {
   return src(['./assets/styles/app.scss'])
     .pipe(sass().on('error', sass.logError))
     .pipe(autoprefixer({
-        browsers: ['last 2 versions'],
         cascade: false
     })).on('error', handleError)
     // .pipe(prod ? cssmin() : util.noop())
     .pipe(gulpif(prod, cssmin()))
     // .pipe(cssmin())
     .pipe(rename({suffix: '.min'}))
-    .pipe(gulp.dest('./assets/dist/styles/'));
+    .pipe(dest('./assets/dist/styles/'));
 }
 
 async function bower(){
@@ -67,18 +65,18 @@ async function bower(){
       "outlayer":{"ignore":true},
     }
   }))
-    .pipe(gulp.dest('./assets/dist/bower/'));
+    .pipe(dest('./assets/dist/bower/'));
 }
 
 async function minsvg(){
   return src(['./assets/img/*.svg', '!./assets/img/edlp-loader-anim.svg'])
     .pipe(svgmin())
-    .pipe(gulp.dest('./assets/dist/img'));
+    .pipe(dest('./assets/dist/img'));
 }
 
 async function svg(){
   return src('./assets/img/edlp-loader-anim.svg')
-    .pipe(gulp.dest('./assets/dist/img'));
+    .pipe(dest('./assets/dist/img'));
 }
 
 function devwatch(){