Gitlab CSE Unil

Commit cf1fc902 authored by M. Chardon's avatar M. Chardon
Browse files

maj lib js paper, bootstrap slider, bootstrap colorpicker

maj bower lib
maj vers jquery 3.3 -> attention encore des bug
attention pour paper.js : la nouvelle maj pose des soucis, on reste sur du 0.9. à creuser
attention pour typehead : trouver une solution pour la sous lib qui est utilisée (blood...)
parent df71ac1e
......@@ -77,7 +77,7 @@
function enableWidgets(elemInput) {
elemInput.removeAttr("disabled");
elemInput.prop( "disabled", false );
// Give live to the newly generated widgets
elemInput.closest('.rating-input')
.removeClass("disabled")
......
......@@ -121,9 +121,9 @@ define(["paper"], function (paper) {
var handlerCtxts = defs[i].ctxt && defs[i].ctxt.split(" ");
var evt = defs[i].event || 'keydown';
$(document).unbind(evt, handler);
$(document).off(evt, handler);
if (!handlerCtxts || handlerCtxts.indexOf(ctxt) > -1) {
$(document).bind(
$(document).on(
evt, {keys: keys}, handler
);
}
......
......@@ -289,7 +289,7 @@ function($, _, Signal, paper, config, view, io, tools, attributes, Users, export
// .addClass("active btn-success")
// .removeClass("btn-primary");
// } else {
// saveBut.removeAttr("disabled");
// saveBut.prop( "disabled", false );
// autoSaveBut
// .removeClass("active btn-success")
// .addClass("btn-primary");
......@@ -825,7 +825,7 @@ function($, _, Signal, paper, config, view, io, tools, attributes, Users, export
var $toolBtn = $("#draw-tool-tb").find('[data-tool-name="' + toolType + '"]');
if ($toolBtn.length === 0) return;
if (enable) {
$toolBtn.removeAttr("disabled")
$toolBtn.prop( "disabled", false )
.parent(".btn").removeClass("disabled");
} else {
if (toolType === activeTool) {
......@@ -877,7 +877,7 @@ function($, _, Signal, paper, config, view, io, tools, attributes, Users, export
$("#tool-fill-color").attr('disabled', 'disabled');
} else {
$("#tool-fill-color")
.removeAttr('disabled')
.prop( "disabled", false )
.click(function(){
var isFill = !($(this).is(".active"));
attributes.setFill(isFill);
......@@ -889,7 +889,7 @@ function($, _, Signal, paper, config, view, io, tools, attributes, Users, export
$("#attr-font").attr('disabled', "disabled");
} else {
$("#attr-font")
.removeAttr('disabled')
.prop( "disabled", false )
.popover({
title: 'Propriétés des textes <button type="button" class="close" style="margin:-9px">&times;</button>',
html: true,
......@@ -927,12 +927,12 @@ function($, _, Signal, paper, config, view, io, tools, attributes, Users, export
}
};
var closePopover = function() {
$(document).unbind('click', checkInside);
$(document).off('click', checkInside);
$("#attr-font").popover('hide');
};
$pop.find(".close").on('click', closePopover);
$(document).bind('click', checkInside);
$(document).on('click', checkInside);
})
;
}
......@@ -1276,7 +1276,7 @@ function($, _, Signal, paper, config, view, io, tools, attributes, Users, export
} else {
var _tId = null;
_colorSelector.find('.tinter').removeAttr("disabled");
_colorSelector.find('.tinter').prop( "disabled", false );
_colorSelector.find(".picker")
.colorpicker()
.on('mouseup', function(evt){
......@@ -1406,7 +1406,7 @@ function($, _, Signal, paper, config, view, io, tools, attributes, Users, export
if (config.mode !== config.MODE_EDIT)
status = false;
if (status) {
this.el.removeAttr("disabled");
this.el.prop( "disabled", false );
} else {
this.el.attr("disabled","disabled");
}
......@@ -1466,7 +1466,7 @@ function($, _, Signal, paper, config, view, io, tools, attributes, Users, export
status = false;
if (status) {
this.el.removeAttr("disabled");
this.el.prop( "disabled", false );
} else {
this.el.attr("disabled","disabled");
}
......@@ -1665,7 +1665,7 @@ function($, _, Signal, paper, config, view, io, tools, attributes, Users, export
$("[data-tool-name]").button();
if (currentButton.get(0) !== activatedButton.get(0)) {
currentButton
.removeAttr("checked")
.prop( "checked", false )
.parent(".btn").removeClass("active");
activatedButton
.attr("checked","checked")
......
......@@ -182,7 +182,7 @@ define([
if (ttpShared || !owned) {
this.$(".aom-prop-lock-but").attr("disabled", "disabled");
} else {
this.$(".aom-prop-lock-but").removeAttr("disabled");
this.$(".aom-prop-lock-but").prop( "disabled", false );
}
var sharingModeSelect = this.sharingPropEl.find("[name=aom-prop-shared]");
......@@ -192,9 +192,9 @@ define([
.attr("disabled", "disabled")
.closest(".checkbox").addClass("disabled text-muted");
} else {
sharingModeSelect.removeAttr("disabled");
sharingModeSelect.prop( "disabled", false );
this.publicPublishEl
.removeAttr("disabled")
.prop( "disabled", false )
.closest(".checkbox").removeClass("disabled text-muted");
}
sharingModeSelect.val([sharingMode]);
......@@ -474,7 +474,7 @@ define([
removeBut = this.$(".aom-shm-ctrl-members-remove-but");
if (has_selection) {
removeBut.removeAttr("disabled");
removeBut.prop( "disabled", false );
} else {
removeBut.attr("disabled", "disabled");
}
......@@ -516,7 +516,7 @@ define([
} else {
memberItems.prop("selected", true);
listEl.focus();
removeBut.removeAttr("disabled");
removeBut.prop( "disabled", false );
}
},
......
......@@ -16,23 +16,25 @@
"requirejs": "",
"requirejs-i18n": "",
"jquery": "",
"bootstrap": "",
"bootstrap": "~3.3.7",
"jquery-mousewheel": "~3.1.11",
"FileSaver": "~1.3.4",
"blob": "*",
"paper": "~0.11.5",
"paper": "~0.9.25",
"jquery.autoGrowInput": "~0.0.2",
"signals": "~1.0.0",
"bootstrap-spinedit": "https://github.com/jujug42/bootstrap-spinedit.git#*",
"seiyria-bootstrap-slider": "git://github.com/seiyria/bootstrap-slider#~4.0.1",
"seiyria-bootstrap-slider": "~10.0.0",
"backbone": "~1.3.3",
"jquery-file-upload": "~9.20.0",
"jujug42-bootstrap-colorpicker": "https://github.com/jujug42/bootstrap-colorpicker.git#8498378921e71a7781f06543ca3abfa367916b25",
"bootstrap-colorpicker": "~2.5.1",
"bootstrap3-typeahead": "https://github.com/bassjobsen/Bootstrap-3-Typeahead.git#master",
//"typeahead.js": "~0.11.1",
"typeahead.js": "~0.11.1",
"bootstrap-rating-input": "~0.4.0",
"jquery.hotkeys": "git://github.com/jeresig/jquery.hotkeys.git#~0.2.0",
"sortablejs": "~1.6.0",
"select2": "~4.0"
"select2": "~4.0",
"zeroclipboard": "~2.3.0",
"blueimp-file-upload": "~9.20.0"
}
}
......@@ -35,12 +35,12 @@ requirejs.config({
name: 'paper',
location: '../_src/lib/paper/dist',
main: 'paper-core'
},
}/*,
{
name: 'typeahead',
location: '../_src/lib/typeahead.js/dist',
main: 'typeahead.jquery'
}],
}*/],
paths: {
adim: '../_src/adim',
tools: '../_src/adim/tools',
......@@ -70,13 +70,13 @@ requirejs.config({
'jquery.fileupload-proc': "../_src/lib/jquery-file-upload/js/jquery.fileupload-process",
'jquery.mousewheel': "../_src/lib/jquery-mousewheel/jquery.mousewheel.min",
'jquery.autoGrowInput': "../_src/lib/jquery.autoGrowInput/jquery.autoGrowInput",
//'jquery.typeahead': "../_src/lib/typeahead.js/dist/typeahead.jquery.min",
// 'jquery.typeahead': "../_src/lib/typeahead.js/dist/typeahead.jquery.min",
'jquery.hotkeys': "../_src/lib/jquery.hotkeys/jquery.hotkeys.min",
'jquery.select2': "../_src/lib/select2/dist/js/select2.full",
//'select2/compat/inputData':"../_src/lib/select2/dist/js/select2",
'jquery-migrate': '//code.jquery.com/jquery-migrate-3.0.0',
'jquery.bootstrap': "../_src/lib/bootstrap/dist/js/bootstrap.min",
'bootstrap.colorpicker': "../_src/lib/jujug42-bootstrap-colorpicker/dist/js/bootstrap-colorpicker.min",
'bootstrap.colorpicker': "../_src/lib/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.min",
'bootstrap.spinedit': "../_src/lib/bootstrap-spinedit/js/bootstrap-spinedit",
'bootstrap.slider': "../_src/lib/seiyria-bootstrap-slider/dist/bootstrap-slider.min",
'bootstrap.rating': "../_src/adim/helper/bootstrap-rating-input"
......@@ -92,9 +92,10 @@ requirejs.config({
},
'jquery.mousewheel': { deps: ["jquery"] },
'jquery.autoGrowInput': { deps: ["jquery"] },
'jquery.typeahead': { deps: ["jquery"]},
//'jquery.typeahead': { deps: ["jquery"]},
'jquery.hotkeys': { deps: ["jquery"]},
'jquery.bootstrap': { deps: ["jquery"] },
'jquery-migrate': { deps: ['jquery'], exports: 'jQuery' },
'bootstrap.colorpicker': { deps: ["jquery.bootstrap"] },
'bootstrap.slider': { deps: ["jquery.bootstrap"] },
'bootstrap.spinedit': { deps: ["jquery.bootstrap"] },
......
This diff is collapsed.
Markdown is supported
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