From 8593ee9fbb31354a407defa4457f164cb9c3609b Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 15 Jan 2016 09:25:28 -0500
Subject: [PATCH] Improve handling of ATTACH property (URIs)

---
 SOPE/NGCards/iCalEntityObject.m                         | 2 +-
 UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox | 2 +-
 UI/Templates/SchedulerUI/UIxTaskViewTemplate.wox        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SOPE/NGCards/iCalEntityObject.m b/SOPE/NGCards/iCalEntityObject.m
index 8d8b222db..3e3034e6a 100644
--- a/SOPE/NGCards/iCalEntityObject.m
+++ b/SOPE/NGCards/iCalEntityObject.m
@@ -440,7 +440,7 @@
       stringAttach = [[elements objectAtIndex: count] flattenedValuesForKey: @""];
       url = [NSURL URLWithString: stringAttach];
 
-      if (!url && [stringAttach length] > 0)
+      if (![url scheme] && [stringAttach length] > 0)
         url = [NSURL URLWithString: [NSString stringWithFormat: @"http://%@", stringAttach]];
 
       [attachUrls addObject: [url absoluteString]];
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox b/UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox
index 8faf9ecf7..3ad9b5240 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox
@@ -82,7 +82,7 @@
         <!-- attach urls -->
         <md-list-item ng-show="editor.component.attachUrls.length > 0">
           <md-icon>link</md-icon>
-          <p ng-repeat="url in ::editor.component.attachUrls"><a ng-href="{{url.value}}">{{url.value}}</a></p>
+          <p ng-repeat="url in ::editor.component.attachUrls"><a target="_new" ng-href="{{url.value}}">{{url.value}}</a></p>
         </md-list-item>
         <!-- comment -->
         <md-list-item ng-show="editor.component.comment">
diff --git a/UI/Templates/SchedulerUI/UIxTaskViewTemplate.wox b/UI/Templates/SchedulerUI/UIxTaskViewTemplate.wox
index 4b69c51bf..88c845f3f 100644
--- a/UI/Templates/SchedulerUI/UIxTaskViewTemplate.wox
+++ b/UI/Templates/SchedulerUI/UIxTaskViewTemplate.wox
@@ -82,7 +82,7 @@
         <!-- attach urls -->
         <md-list-item  ng-repeat="url in ::editor.component.attachUrls">
           <md-icon>link</md-icon>
-          <p><a ng-href="url.value">{{url.value}}</a></p>
+          <p><a ng-href="url.value" target="_new">{{url.value}}</a></p>
         </md-list-item>
         <!-- comment -->
         <md-list-item ng-show="editor.component.comment">