Simplified divider syntax. Dropped unnecessary scope-specific drag co…

…mmands. git-svn-id: http://svn.textmate.org/trunk/Bundles/Blogging.tmbundle@3740 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
textmate · Jun 20, 2006 · 86323c7 · 86323c7
1 parent ec15778
commit 86323c7
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 73 deletions.
diff --git a/DragCommands/Upload Image (HTML).tmDragCommand b/DragCommands/Upload Image (HTML).tmDragCommand
diff --git a/DragCommands/Upload Image (Textile).tmDragCommand b/DragCommands/Upload Image (Textile).tmDragCommand
diff --git a/DragCommands/Upload Image.tmDragCommand b/DragCommands/Upload Image.tmDragCommand
@@ -7,7 +7,6 @@
 	<key>command</key>
 	<string>#!/usr/bin/env ruby
 require "#{ENV['TM_BUNDLE_SUPPORT']}/lib/blogging.rb"
-ENV["TM_SCOPE"] ||= "text.blog.markdown"
 Blogging.new.upload_image</string>
 	<key>draggedFileExtensions</key>
 	<array>
@@ -19,11 +18,11 @@ Blogging.new.upload_image</string>
 	<key>input</key>
 	<string>selection</string>
 	<key>name</key>
-	<string>Upload Image (Markdown)</string>
+	<string>Upload Image</string>
 	<key>output</key>
 	<string>insertAsSnippet</string>
 	<key>scope</key>
-	<string>text.blog text.html.markdown</string>
+	<string>text.blog text.html.markdown, text.blog text.html.textile, text.blog text.html, text.blog text.plain</string>
 	<key>uuid</key>
 	<string>7A2373C1-A300-49B5-9F83-676612D8D5B5</string>
 </dict>

diff --git a/Support/lib/blogging.rb b/Support/lib/blogging.rb
@@ -204,7 +204,7 @@ def parse_post
           in_headers = false
         end
       end
-      if line =~ %r{^(#{DIVIDER})+}
+      if line =~ %r{^✂-[✂-]+}
         if !separator
           separator = true
           next

diff --git a/Syntaxes/Blog (HTML).plist b/Syntaxes/Blog (HTML).plist
@@ -56,7 +56,7 @@
 			<array>
 				<dict>
 					<key>match</key>
-					<string>^(✂-{6})+$\n</string>
+					<string>^✂-[✂-]+$\n</string>
 					<key>name</key>
 					<string>meta.separator.blog</string>
 				</dict>

diff --git a/Syntaxes/Blog (Markdown).plist b/Syntaxes/Blog (Markdown).plist
@@ -57,7 +57,7 @@
 			<array>
 				<dict>
 					<key>match</key>
-					<string>^(✂-{6})+$\n</string>
+					<string>^✂-[✂-]+$\n</string>
 					<key>name</key>
 					<string>meta.separator.blog</string>
 				</dict>

diff --git a/Syntaxes/Blog (Text).plist b/Syntaxes/Blog (Text).plist
@@ -42,7 +42,7 @@
 			<array>
 				<dict>
 					<key>match</key>
-					<string>^(✂-{6})+$\n</string>
+					<string>^✂-[✂-]+$\n</string>
 					<key>name</key>
 					<string>meta.separator.blog</string>
 				</dict>

diff --git a/Syntaxes/Blog (Textile).plist b/Syntaxes/Blog (Textile).plist
@@ -42,7 +42,7 @@
 			<array>
 				<dict>
 					<key>match</key>
-					<string>^(✂-{6})+$\n</string>
+					<string>^✂-[✂-]+$\n</string>
 					<key>name</key>
 					<string>meta.separator.blog</string>
 				</dict>

diff --git a/Templates/Weblog Post/info.plist b/Templates/Weblog Post/info.plist
@@ -14,6 +14,8 @@
 fi</string>
 	<key>extension</key>
 	<string>blog.markdown</string>
+	<key>keyEquivalent</key>
+	<string>^~@n</string>
 	<key>name</key>
 	<string>Weblog Post (Markdown)</string>
 	<key>uuid</key>

diff --git a/info.plist b/info.plist
@@ -2,15 +2,19 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>deleted</key>
+	<array>
+		<string>50E2C4D2-F53F-4E84-A3CC-14109A814E16</string>
+		<string>E41D6B15-7CA5-4E45-BCE6-93A1AF85C424</string>
+	</array>
 	<key>mainMenu</key>
 	<dict>
 		<key>items</key>
 		<array>
 			<string>10CFDE4C-E433-48F8-AB94-17E1FBEFC074</string>
-			<string>BD6E6210-F4A3-4821-BA43-A9DFF4178704</string>
-			<string>------------------------------------</string>
 			<string>60853977-B0D2-4776-A3D9-4B6C09E18596</string>
 			<string>FA5DC73E-AAE0-4C69-86E1-87B9E0390FD0</string>
+			<string>BD6E6210-F4A3-4821-BA43-A9DFF4178704</string>
 			<string>------------------------------------</string>
 			<string>3E064A5D-EC5C-48F8-B3BC-15F4CD442827</string>
 			<string>6F1CF327-E4C8-49D8-BD30-FD6F987AE23A</string>
@@ -63,13 +67,11 @@
 		<string>32E65853-CDBD-401A-ADBE-F94F195249BE</string>
 		<string>E46F5C50-5D16-4B5C-8FBB-686BD3768284</string>
 		<string>B2CCDFF8-0FB3-492A-8761-D31FF0FAC448</string>
+		<string>7A2373C1-A300-49B5-9F83-676612D8D5B5</string>
 		<string>F0B36FAE-07A0-46C9-992F-5901327FE266</string>
 		<string>60F07B75-41FD-473F-A390-9E821D880469</string>
 		<string>E7B58845-506D-4065-9835-0D37DCFC02D2</string>
 		<string>96F84D65-3CD5-4088-9360-15131E1611DF</string>
-		<string>7A2373C1-A300-49B5-9F83-676612D8D5B5</string>
-		<string>50E2C4D2-F53F-4E84-A3CC-14109A814E16</string>
-		<string>E41D6B15-7CA5-4E45-BCE6-93A1AF85C424</string>
 	</array>
 	<key>uuid</key>
 	<string>79741B2E-271D-4CBC-A61A-380C83D36863</string>