Changeset 9027

Timestamp:

04/07/08 01:02:44 (5 years ago)

Author:

drry

Message:

lang/javascript/userscripts/minibuffer.user.js:

• fixed regexps.
  

Files:

• lang/javascript/userscripts/minibuffer.user.js (modified) (6 diffs)

lang/javascript/userscripts/minibuffer.user.js

@@ -17 +17 @@
           this.key = this.orig_string.replace(/[ACMS]-/g,'');
   },
-  has: function(modifier){return this.orig_string.indexOf(modifier) != -1},
+  has: function(modifier){return this.orig_string.indexOf(modifier) > -1},
   equal: function (e, ch){
           return (this.key == ch &&
@@ -597 +597 @@
   },
   bindBackwardWord: function(){
-          var i=this.html.input, l=i.value.slice(0,i.selectionStart).replace(/[a-zA-Z0-9]*$|[^a-zA-Z0-9]*$/,'').length;
+          var i=this.html.input, l=i.value.slice(0,i.selectionStart).replace(/[a-zA-Z0-9]+$|[^a-zA-Z0-9]+$/,'').length;
           i.setSelectionRange(l,l);
   },
@@ -610 +610 @@
   bindDeleteBackwardWord: function(){
           var i=this.html.input, b=i.selectionStart, e=i.selectionEnd;
-          var tx = i.value, tr=tx.slice(0,b-1).replace(/[^a-zA-Z0-9]*$/,'').replace(/[a-zA-Z0-9]*$/,''), l=tr.length;
+          var tx = i.value, tr=tx.slice(0,b-1).replace(/[^a-zA-Z0-9]+$/,'').replace(/[a-zA-Z0-9]+$/,''), l=tr.length;
           i.value = tr+tx.slice(e);
           i.setSelectionRange(l,l);
@@ -814 +814 @@
                         font-size : 500%;
                         z-index : 10000;
-                        
+
                         padding : 50px;
                         left : 50%;
                         top : 50%;
                         margin : -1em;
-                        
+
                         background-color : #444;
                         color : #FFF;
@@ -1128 +1128 @@
                 context = context['context'];
         }
-        
+
         if (!context) context = document;
         var exp = (context.ownerDocument || context).createExpression(exp, function (prefix) {
@@ -1417 +1417 @@
 
 String.prototype.escapeRegexp = function(){
-        return this.replace(/^\?/, '.?').replace(/^\*/, '.*').replace(/\|/g,'\\|').replace(/\+/g,'\\+').replace(/\([^)]*$/, '').replace(/\[[^\]]*$/, '');
+        return this.replace(/^(?=[?*])/, '.').replace(/(?=[|+])/g, '\\').replace(/\([^)]*$/, '').replace(/\[[^\]]*$/, '');
 }
 Array.prototype.position = function(obj){