From: Alan Knowles Date: Wed, 19 Dec 2018 03:10:00 +0000 (+0800) Subject: Merge branch 'master' of http://git.roojs.com/roojs1 X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=46068cd58eef522565ed1729d1171d5ff2aab292;hp=e7f7af2416fd88190985ae84ae656f6b872f86af Merge branch 'master' of git.roojs.com/roojs1 --- diff --git a/examples/bootstrap4/nested.html b/examples/bootstrap4/nested.html index 101be70ce9..5391aede1a 100644 --- a/examples/bootstrap4/nested.html +++ b/examples/bootstrap4/nested.html @@ -3,7 +3,7 @@ Nested Layout - + diff --git a/examples/form/dynamic.js b/examples/form/dynamic.js index 9886e49feb..0534df9110 100644 --- a/examples/form/dynamic.js +++ b/examples/form/dynamic.js @@ -305,7 +305,7 @@ Roo.onReady(function(){ mform.addButton('Save'); mform.addButton('Cancel'); - + /* mform.render('form-ct2'); mform.setValues({ country : 'AK,LA', @@ -313,6 +313,7 @@ Roo.onReady(function(){ countrylist : 'AG,AZ', countrylist_names : 'Antigua and Barbuda,Azerbaijan' }); + */ /* * ================ Form 3 ======================= */