Commit 430e6f239a2b97516542690fc415f0fd593fb801

Authored by Renato De Donato
1 parent 3501c407

dynamic-datatale bug-conflict fixed

datalets/dynamic-datatable-datalet/dynamic-datatable-datalet.html
@@ -60,7 +60,7 @@ Example: @@ -60,7 +60,7 @@ Example:
60 <script type="text/javascript" src="js/DataTables/datatables.js"></script> 60 <script type="text/javascript" src="js/DataTables/datatables.js"></script>
61 61
62 <script> 62 <script>
63 - var DatatableBehavior = { 63 + var DynamicDatatableBehavior = {
64 64
65 presentData: function(){ 65 presentData: function(){
66 var html = "<table id=\"dynamic-datatable\" class=\"stripe row-border\" cellspacing=\"0\" style=\"height: auto; width: auto;\">"; 66 var html = "<table id=\"dynamic-datatable\" class=\"stripe row-border\" cellspacing=\"0\" style=\"height: auto; width: auto;\">";
@@ -121,7 +121,7 @@ Example: @@ -121,7 +121,7 @@ Example:
121 }, 121 },
122 122
123 ready: function(){ 123 ready: function(){
124 - this.behavior = $.extend(true, {}, BaseDataletBehavior, WorkcycleBehavior, AjaxJsonJsonPathBehavior, DatatableBehavior); 124 + this.behavior = $.extend(true, {}, BaseDataletBehavior, WorkcycleBehavior, AjaxJsonJsonPathBehavior, DynamicDatatableBehavior);
125 this.async(function(){this.behavior.init(this)}, 0); 125 this.async(function(){this.behavior.init(this)}, 0);
126 }, 126 },
127 127