From db3c6c14637437645fbd46c3e80e00b36e4ef2a6 Mon Sep 17 00:00:00 2001 From: Ross Boucher Date: Sat, 27 Mar 2010 13:25:44 -0700 Subject: [PATCH] A few minor updates to the pathExtension patch. --- Foundation/CPString.j | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Foundation/CPString.j b/Foundation/CPString.j index 861b54b12..51154a43c 100644 --- a/Foundation/CPString.j +++ b/Foundation/CPString.j @@ -664,8 +664,9 @@ var CPStringRegexSpecialCharacters = [ */ - (CPString)pathExtension { - if (lastIndexOf('.') == CPNotFound) + if (lastIndexOf('.') === CPNotFound) return ""; + return substr(lastIndexOf('.') + 1); } @@ -708,9 +709,11 @@ var CPStringRegexSpecialCharacters = [ { var extension = [self pathExtension]; if (extension === "") - return [self copy]; + return self; + if (lastIndexOf('.') < 1) - return [self copy]; + return self; + return substr(0, [self length] - (extension.length + 1)); }