Commit c388fc3d authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'hotfix-removeEndOfProjectWarning' into 'dev' 

Hotfix remove end of project warning

See merge request redmic-project/client/web!81
parents 63faa840 1fe5caf9

grunt/config/buildModules.js

+4 −0
Original line number Diff line number Diff line
@@ -3,6 +3,10 @@ module.exports = function(grunt) { 
	var preBuildCmds = ['yarn install'];



	grunt.config('redmicConfig.buildModules', {

		'public/javascript/pdfjs': [

			'npm install',

			'gulp generic'

		],

		'public/javascript/pruneCluster': [

			'npm install',

			'grunt build:dist --force'

grunt/config/copy.js

+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ module.exports = function(grunt) { 
		distStylesSubPath = distPath + '/stylesheets',



		pdfjsPath = '/javascript/pdfjs/',

		srcPdfjsPath = publicPath + pdfjsPath,

		pdfjsBuildPath = 'build/generic/',

		srcPdfjsPath = publicPath + pdfjsPath + pdfjsBuildPath,

		distPdfjsPath = distPath + pdfjsPath,

		pdfjsWebName = 'web',

		pdfjsBuildName = 'build';

package.json

+4 −3
Original line number Diff line number Diff line 
{

  "name": "REDMIC",

  "version": "0.19.4",

  "version": "0.19.6",

  "author": "REDMIC",

  "homepage": "https://gitlab.com/redmic-project/client/web/blob/master/README.md",

  "description": "Integrated marine data repository of Canary Islands - Client",
@@ -28,7 +28,6 @@ 
  },

  "private": true,

  "scripts": {

    "preinstall": "depsToUnlock='pdfjs'; lockBefore=$(md5sum yarn.lock); for dep in $depsToUnlock; do echo \"Unlocking ${dep}\"; sed -i \"/${dep}@/,/^$/ d\" yarn.lock; done; lockAfter=$(md5sum yarn.lock); if [ \"${lockBefore}\" != \"${lockAfter}\" ]; then echo \"Some dependencies were unlocked, retry install in case of failure\"; fi",

    "start": "node app"

  },

  "dependencies": {
@@ -64,6 +63,8 @@ 
    "grunt-force-task": "^2.0.0",

    "grunt-git": "^1.0.9",

    "grunt-shell": "^2.1.0",

    "gulp": "^2.7.0",

    "gulp-cli": "^2.2.0",

    "handlebars": "^4.0.11",

    "intern": "^4.2.0",

    "jshint": "^2.9.5",
@@ -83,7 +84,7 @@ 
    "nib": "^1.1.2",

    "node-uuid": "https://github.com/kelektiv/node-uuid.git#v1.4.7",

    "packery": "^2.1.1",

    "pdfjs": "https://github.com/mozilla/pdf.js.git#gh-pages",

    "pdfjs": "https://github.com/mozilla/pdf.js.git#v2.3.200",

    "prunecluster": "https://github.com/pedroetb/PruneCluster.git",

    "put-selector": "^0.3.6",

    "sockjs-client": "^1.1.4",

public/javascript/app/innerApp.js

+0 −12
Original line number Diff line number Diff line
@@ -126,18 +126,6 @@ define([ 
			});



			this._evaluateAppSize();



			var url = 'https://redmicdev.wordpress.com/2019/09/04/cierre-del-proyecto-redmic/',

				message = this.i18n.endOfProjectMessage + ' <a href="' + url + '" target="_blank">' + this.i18n.here +

					'</a>.';



			this._emitEvt('COMMUNICATION', {

				type: 'alert',

				level: 'warning',

				description: message,

				position: 'top-center',

				timeout: 0

			});

		},



		_subToggleSidebar: function(req) {

public/javascript/app/nls/es/translation.js

+0 −2
Original line number Diff line number Diff line
@@ -1214,8 +1214,6 @@ define({ 
	, "fullscreen": "Pantalla completa"

	, "version": "Versión"



	, "endOfProjectMessage": "A finales de este año, está previsto el cierre del proyecto REDMIC. Más info"



	// Para capas que no se pueden cambiar las keys

	, "descript_1": "Descripción"

	, "descriptio": "Descripción"