fixed compatibility with module flag_lists 3.x
converted materiobasemod js processor to gulp
This commit is contained in:
@@ -270,7 +270,7 @@ MaterioFlag = function(){
|
||||
* onClickCreatLink(event)
|
||||
*/
|
||||
function onClickCreatLink(event){
|
||||
//trace('MaterioFlag :: onClickCreatLink | event', event);
|
||||
// trace('MaterioFlag :: onClickCreatLink | event', event);
|
||||
event.preventDefault();
|
||||
var $link = $(event.currentTarget);
|
||||
var type = $link.attr('href').match(/[^\/]*$/);
|
||||
@@ -285,7 +285,7 @@ MaterioFlag = function(){
|
||||
};
|
||||
|
||||
function showCreateListForm(json, $link){
|
||||
//trace('MaterioFlag :: showCreateListForm | json', json);
|
||||
// trace('MaterioFlag :: showCreateListForm | json', json);
|
||||
// google analytics
|
||||
$.event.trigger({
|
||||
type:"record-stat",
|
||||
@@ -317,20 +317,22 @@ MaterioFlag = function(){
|
||||
});
|
||||
|
||||
break;
|
||||
case 'create':
|
||||
//trace('MaterioFlag :: create',event);
|
||||
var title = $(this).parents('form').find('input[name*="flag-lists-name"]').val();
|
||||
case 'op':
|
||||
trace('MaterioFlag :: create',event);
|
||||
var name = $(this).parents('form').find('input[name*="title"]').val();
|
||||
// name = encodeURIComponent(name);
|
||||
var type = $(this).parents('form').find('input[name*="type"]').val();
|
||||
var token = $(this).parents('form').find('input[name*="form_token"]').val();
|
||||
|
||||
// google analytics
|
||||
$.event.trigger({
|
||||
type : "record-stat",
|
||||
categorie : "flagLists",
|
||||
action : "submit create form",
|
||||
label : 'title : '+title
|
||||
label : 'title : '+name
|
||||
});
|
||||
|
||||
createList($modal, type, title, $link);
|
||||
createList($modal, type, name, token, $link);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -340,20 +342,20 @@ MaterioFlag = function(){
|
||||
// TODO: esc keypressed close the form
|
||||
};
|
||||
|
||||
function createList($modal, type, title, $link){
|
||||
//trace('materioflag :: createList | title', title);
|
||||
function createList($modal, type, name, token, $link){
|
||||
// trace('materioflag :: createList | title', name);
|
||||
$('.flag-lists-create').addClass('loading');
|
||||
|
||||
var url = Drupal.settings.basePath+Drupal.settings.pathPrefix+'flag-lists/add/'+type+'/js';
|
||||
$.getJSON(url, {name:title}, function(data) {
|
||||
$.getJSON(url, {form_token:token,name:name}, function(data) {
|
||||
if (data.error) {
|
||||
//trace(data.error);
|
||||
trace("MaterioFlag :: created list : data.error", data.error);
|
||||
}
|
||||
else {
|
||||
// select.append('<option value="'+data.flag.fid+'">'+data.flag.title+'</option>');
|
||||
// $('input.name', $(this)).val('');
|
||||
// dialog.dialog('close');
|
||||
//trace('MaterioFlag :: created list : data', data);
|
||||
// trace('MaterioFlag :: created list : data', data);
|
||||
if($link.attr('nid') && $link.attr('token')){
|
||||
flagEntityWithList(data.flag.name, $link.attr('nid'), $link.attr('token'));
|
||||
}else{
|
||||
@@ -566,12 +568,17 @@ MaterioFlag = function(){
|
||||
alert(data.message);
|
||||
}
|
||||
else {
|
||||
//trace('MaterioFlag :: deleted list : data', data);
|
||||
trace('MaterioFlag :: deleted list : data', data);
|
||||
|
||||
refreshBlocks();
|
||||
refreshNodeLinks();
|
||||
// TODO: if the deleted list was the current displayed list ??
|
||||
$modal.remove();
|
||||
|
||||
// TODO: if the deleted list was the current displayed list ??
|
||||
trace("MaterioFlag :: deleted list : document.location.href", document.location.href);
|
||||
if(document.location.href.indexOf("/lists/"+data.fid) !== -1){
|
||||
window.location = Drupal.settings.basePath + Drupal.settings.pathPrefix +"actuality";
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
@@ -710,4 +717,4 @@ $(document).ready(function() {
|
||||
var materioflag = new MaterioFlag();
|
||||
});
|
||||
|
||||
})(jQuery);
|
||||
})(jQuery);
|
||||
|
Reference in New Issue
Block a user