| Index: branches/usability/acaifix/EditToolbar/EditToolbar.js |
| — | — | @@ -149,11 +149,9 @@ |
| 150 | 150 | action: { |
| 151 | 151 | type: 'replace', |
| 152 | 152 | options: { |
| 153 | | - pre: "==", |
| 154 | 153 | periMsg: 'edittoolbar-tool-heading-example', |
| 155 | | - periRegex: /^(={1,6})(.*?)\1\s*$/, |
| 156 | | - periRegexReplace: "\$2", |
| 157 | | - post: "==" |
| | 154 | + periRegex: /^(\s*)(={1,6})(.*?)\2(\s*)$/, |
| | 155 | + periRegexReplace: "\$1==\$3==\$4" |
| 158 | 156 | } |
| 159 | 157 | } |
| 160 | 158 | }, |
| — | — | @@ -162,11 +160,9 @@ |
| 163 | 161 | action: { |
| 164 | 162 | type: 'replace', |
| 165 | 163 | options: { |
| 166 | | - pre: "===", |
| 167 | | - periRegex: /^(={1,6})(.*?)\1\s*$/, |
| 168 | | - periRegexReplace: "\$2", |
| 169 | 164 | periMsg: 'edittoolbar-tool-heading-example', |
| 170 | | - post: "===" |
| | 165 | + periRegex: /^(\s*)(={1,6})(.*?)\2(\s*)$/, |
| | 166 | + periRegexReplace: "\$1===\$3===\$4" |
| 171 | 167 | } |
| 172 | 168 | } |
| 173 | 169 | }, |
| — | — | @@ -175,11 +171,9 @@ |
| 176 | 172 | action: { |
| 177 | 173 | type: 'replace', |
| 178 | 174 | options: { |
| 179 | | - pre: "====", |
| 180 | | - periRegex: /^(={1,6})(.*?)\1\s*$/, |
| 181 | | - periRegexReplace: "\$2", |
| 182 | 175 | periMsg: 'edittoolbar-tool-heading-example', |
| 183 | | - post: "====" |
| | 176 | + periRegex: /^(\s*)(={1,6})(.*?)\2(\s*)$/, |
| | 177 | + periRegexReplace: "\$1====\$3====\$4" |
| 184 | 178 | } |
| 185 | 179 | } |
| 186 | 180 | }, |
| — | — | @@ -188,11 +182,9 @@ |
| 189 | 183 | action: { |
| 190 | 184 | type: 'replace', |
| 191 | 185 | options: { |
| 192 | | - pre: "=====", |
| 193 | | - periRegex: /^(={1,6})(.*?)\1\s*$/, |
| 194 | | - periRegexReplace: "\$2", |
| 195 | 186 | periMsg: 'edittoolbar-tool-heading-example', |
| 196 | | - post: "=====" |
| | 187 | + periRegex: /^(\s*)(={1,6})(.*?)\2(\s*)$/, |
| | 188 | + periRegexReplace: "\$1=====\$3=====\$4" |
| 197 | 189 | } |
| 198 | 190 | } |
| 199 | 191 | } |
| Property changes on: branches/usability/acaifix/EditToolbar/EditToolbar.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 200 | 192 | + /branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:51646 |
| /trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56151-57234 |
| /trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js:58873 |
| /trunk/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 |