removed my silly 'url' property, moved the parsing into its own method, and set the _is_parsed flag only when the uri is actually parsed

Author: p01

src/resource-manager/resource_detail_view.js

@@ -57,6 +57,12 @@ cls.ResourceDetailView = function(id, name, container_class, html, default_handl
 			};
 */
 			resource.data = new cls.ResourceManager["1.0"].ResourceData( data );
+			if(resource.type=='image')
+			{
+				var i=new Image();
+				i.src=resource.data.content.stringData;
+				resource.data.meta = i.naturalWidth+'x'+i.naturalHeight;
+			}
 			if (this.resourceId==id){ this.resource = resource; }
 		}
 		this.update();

src/resource-manager/resource_service.js

@@ -264,7 +264,7 @@ cls.ResourceContext = function(data)
       if (!frame.groups[type]){ type='other'; }
 
       frame.groups[type].push( res.id );
-      this.resourcesUrlDict[ res.url.url ] = res.id;
+      this.resourcesUrlDict[ res.url ] = res.id;
 /*
       if (!res.data)
       {
@@ -343,13 +343,18 @@ cls.Resource = function(id)
   this._init(id);
 }
 
-var ResourcePrototype = function()
+cls.ResourcePrototype = function()
 {
+  this._super_init = this._init;
   this._init = function(id)
   {
+    this._super_init();
+
     this.id = id;
     this.finished = false;
-    this.url = null;
+//    debugger;
+//    this.url = 'http://localhost:8002/dragonfly-stp-1-work/src/client-en.xml';
+    //this.url = null;
     this.location = "No URL";
     this.result = null;
     this.mime = null;
@@ -358,13 +363,14 @@ var ResourcePrototype = function()
     this.type = null;
     this.urltype = null;
     this.invalid = false;
+
   }
 
   this.update = function(eventname, eventdata)
   {
     if (eventname == "urlload")
     {
-      this.url = new URI( eventdata.url );
+      this.url = eventdata.url; // new URI( eventdata.url );
       this.urltype = eventdata.urlType;
       // fixme: complete list
       this.urltypeName = {0: "Unknown", 1: "HTTP", 2: "HTTPS", 3: "File", 4: "Data" }[eventdata.urlType];
@@ -374,7 +380,7 @@ var ResourcePrototype = function()
     {
       if (!this.url)
       {
-        this.url = new URI( eventdata.url );
+        this.url = eventdata.url;
       }
       this.result = eventdata.result;
       this.mime = eventdata.mimeType;
@@ -414,10 +420,6 @@ var ResourcePrototype = function()
     }
   }
 
-  this.get_source = function()
-  {
-    // cache, file, http, https ..
-  }
 
   this._guess_type = function()
   {
@@ -453,8 +455,14 @@ var ResourcePrototype = function()
     }
     else
     {
-      this.human_url = this.url.url;
+      this.human_url = this.url; //.url;
     }
   }
 }
-cls.Resource.prototype = new ResourcePrototype();
+
+window.cls.ResourcePrototype.prototype = new URIPrototype("url");
+window.cls.Resource.prototype = new window.cls.ResourcePrototype();
+/*
+ResourcePrototype.prototype = new URIPrototype("url");
+cls.Resource.prototype = new ResourcePrototype();
+*/

src/resource-manager/resource_templates.js

@@ -184,7 +184,7 @@ templates.resource_detail =
 				'class','resource-detail-overview-url'
 			],
 			['span',
-				info.mimeType+' treated as '+info.type,
+				info.mimeType+' treated as '+info.type +' '+[resource.data.meta],
 				'class','resource-detail-overview-type'
 			],
 			['span',

src/scripts/uri.js

@@ -21,7 +21,6 @@ var URIPrototype = function(uri_prop_name)
   */
 
   [
-    "url",
     "hash",
     "host",
     "pathname",
@@ -32,7 +31,7 @@ var URIPrototype = function(uri_prop_name)
     this.__defineGetter__(prop, function()
     {
       if (!this._is_parsed)
-        this._init();
+        this._parse();
 
       return this["_" + prop];  
     });
@@ -94,15 +93,14 @@ var URIPrototype = function(uri_prop_name)
 
   this.__defineSetter__("origin", function() {});
 
-  this._init = function(uri)
+  this._parse = function(uri)
   {
     if (!uri && this[uri_prop_name])
       uri = this[uri_prop_name];
 
     if (uri)
     {
       var val = uri;
-      this._url = uri;
 
       var pos = val.indexOf("#");
       if (pos > -1)
@@ -150,11 +148,16 @@ var URIPrototype = function(uri_prop_name)
         this._pathname = val;
       else
         this._pathname = "";
+
+      this._is_parsed = true;
     }
 
-    this._is_parsed = true;
   };
 
+  this._init = function(uri)
+  {
+    this._parse(uri);
+  }
 };
 
 URI.prototype = new URIPrototype();