[gnome-shell] util: rename from utils, avoid RegExp literal
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] util: rename from utils, avoid RegExp literal
- Date: Thu, 13 Jan 2011 17:15:06 +0000 (UTC)
commit a65a0f03d49e794fb413abdf6b97d84a269bd0f1
Author: Dan Winship <danw gnome org>
Date: Tue Nov 30 11:16:10 2010 -0500
util: rename from utils, avoid RegExp literal
Rename imports.misc.utils to imports.misc.util for more consistency
(eg, with shell-util).
Also, use the string-based RegExp() constructor rather than a RegExp
literal, since the literal is extremely difficult to parse correctly,
and confuses emacs and probably other editors and thus messes up
autoindentation, etc.
https://bugzilla.gnome.org/show_bug.cgi?id=635089
js/Makefile.am | 2 +-
js/misc/{utils.js => util.js} | 2 +-
js/ui/messageTray.js | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/js/Makefile.am b/js/Makefile.am
index b2975fc..3d87dec 100644
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -9,7 +9,7 @@ nobase_dist_js_DATA = \
misc/gnomeSession.js \
misc/params.js \
misc/telepathy.js \
- misc/utils.js \
+ misc/util.js \
perf/core.js \
ui/altTab.js \
ui/appDisplay.js \
diff --git a/js/misc/utils.js b/js/misc/util.js
similarity index 71%
rename from js/misc/utils.js
rename to js/misc/util.js
index 0b7d6c0..0d1d5c4 100644
--- a/js/misc/utils.js
+++ b/js/misc/util.js
@@ -1,7 +1,7 @@
/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
/* http://daringfireball.net/2010/07/improved_regex_for_matching_urls */
-const _urlRegexp = /\b(([a-z][\w-]+:(\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)([^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'\".,<>?«»â??â??â??â??]))/gi;
+const _urlRegexp = new RegExp('\b(([a-z][\w-]+:(/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}/)([^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:\'".,<>?«»â??â??â??â??]))', 'gi');
// findUrls:
// @str: string to find URLs in
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 4188225..e085421 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -16,7 +16,7 @@ const Tweener = imports.ui.tweener;
const Main = imports.ui.main;
const BoxPointer = imports.ui.boxpointer;
const Params = imports.misc.params;
-const Utils = imports.misc.utils;
+const Util = imports.misc.util;
const Gettext = imports.gettext.domain('gnome-shell');
const _ = Gettext.gettext;
@@ -138,13 +138,13 @@ URLHighlighter.prototype = {
this.actor.clutter_text.set_markup(text);
/* clutter_text.text contain text without markup */
- this._urls = Utils.findUrls(this.actor.clutter_text.text);
+ this._urls = Util.findUrls(this.actor.clutter_text.text);
this._highlightUrls();
},
_highlightUrls: function() {
// text here contain markup
- let urls = Utils.findUrls(this._text);
+ let urls = Util.findUrls(this._text);
let markup = '';
let pos = 0;
for (let i = 0; i < urls.length; i++) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]