merged develop back in

This commit is contained in:
Peter 'Pita' Martischka 2012-11-13 07:43:48 -08:00
commit 6de7634357
40 changed files with 9664 additions and 5 deletions

View file

@ -397,6 +397,10 @@ function handshake()
});
// Bind the colorpicker
var fb = $('#colorpicker').farbtastic({ callback: '#mycolorpickerpreview', width: 220});
// Bind the read only button
$('#readonlyinput').on('click',function(){
padeditbar.setEmbedLinks();
});
}
var pad = {