made the Data constructor more generic + started migration process...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>

ui/data4.js

@@ -9,7 +9,7 @@
 
 /*********************************************************************/
 
-var DataClassProto = {
+var DataClassPrototype = {
 	// NOTE: we consider the list sorted...
 	fromList: function(list){
 		var res = new Data()
@@ -754,14 +754,27 @@ var DataPrototype = {
 }
 
 
-var Data = function(){
+function Data(json){
-	this.base = null
+	if(this.constructor.name != 'Data'){
-	this.current = null
+		obj = new Data
-	this.order = [] 
+	} else {
-	this.ribbon_order = [] 
+		obj = this
-	this.ribbons = {}
+	}
 
-	this._gid_cache = []
+	obj.base = null
+	obj.current = null
+	obj.order = [] 
+	obj.ribbon_order = [] 
+	obj.ribbons = {}
+
+	obj._gid_cache = []
+
+	// load initial state...
+	if(json != null){
+		obj.loadJSON(json)
+	}
+
+	return obj
 }
 Data.__proto__ = DataClassPrototype
 Data.prototype = DataPrototype

ui/index.html

@@ -31,6 +31,7 @@
 
 <script src="ribbons.js"></script>
 <script src="data.js"></script>
+<script src="data4.js"></script>
 <script src="formats.js"></script>
 <!--script src="cache.js"></script-->
 <script src="files.js"></script>