diff --git a/dev/Apps/RainLoopApp.js b/dev/Apps/RainLoopApp.js
index b94a981d8..8aa5d60db 100644
--- a/dev/Apps/RainLoopApp.js
+++ b/dev/Apps/RainLoopApp.js
@@ -25,12 +25,12 @@
Cache = require('Storage:RainLoop:Cache'),
Remote = require('Storage:RainLoop:Remote'),
- EmailModel = require('Model:Email'),
- FolderModel = require('Model:Folder'),
- MessageModel = require('Model:Message'),
- AccountModel = require('Model:Account'),
- IdentityModel = require('Model:Identity'),
- OpenPgpKeyModel = require('Model:OpenPgpKey'),
+ EmailModel = require('Model/Email'),
+ FolderModel = require('Model/Folder'),
+ MessageModel = require('Model/Message'),
+ AccountModel = require('Model/Account'),
+ IdentityModel = require('Model/Identity'),
+ OpenPgpKeyModel = require('Model/OpenPgpKey'),
AbstractApp = require('App:Abstract')
;
@@ -1298,19 +1298,20 @@
{
this.setTitle(Utils.i18n('TITLES/LOADING'));
- this.folders(_.bind(function (bValue) {
+ require.ensure([], function () {
- if (bValue)
- {
- require.ensure([], function () {
+ self.folders(_.bind(function (bValue) {
- kn.hideLoading();
+ kn.hideLoading();
+ if (bValue)
+ {
if (window.$LAB && window.crypto && window.crypto.getRandomValues && Settings.capa(Enums.Capa.OpenPGP))
{
window.$LAB.script(window.openpgp ? '' : LinkBuilder.openPgpJs()).wait(function () {
if (window.openpgp)
{
+ Data.openpgp = window.openpgp;
Data.openpgpKeyring = new window.openpgp.Keyring();
Data.capaOpenPGP(true);
@@ -1400,21 +1401,20 @@
self.initLayoutResizer('#rl-left', '#rl-right', Enums.ClientSideKeyName.FolderListSize);
});
}
- });
- }
- else
- {
- kn.hideLoading();
+ }
+ else
+ {
+ self.bootstartLoginScreen();
+ }
- self.bootstartLoginScreen();
- }
+ if (window.SimplePace)
+ {
+ window.SimplePace.set(100);
+ }
- if (window.SimplePace)
- {
- window.SimplePace.set(100);
- }
-
- }, this));
+ }, self));
+
+ });
}
else
{
diff --git a/dev/Boot.js b/dev/Boot.js
index 7859b25d7..eec1bff40 100644
--- a/dev/Boot.js
+++ b/dev/Boot.js
@@ -15,26 +15,25 @@
Utils = require('Common/Utils'),
Enums = require('Common/Enums'),
- EmailModel = require('Model:Email')
+ EmailModel = require('Model/Email')
;
- Globals.__APP = App;
+ Globals.__APP__ = App;
- Plugins.__boot = App;
- Plugins.__remote = App.remote();
- Plugins.__data = App.data();
+ Globals.$win
+ .keydown(Utils.killCtrlAandS)
+ .keyup(Utils.killCtrlAandS)
+ .unload(function () {
+ Globals.bUnload = true;
+ })
+ ;
- Globals.$html.addClass(Globals.bMobileDevice ? 'mobile' : 'no-mobile');
-
- Globals.$win.keydown(Utils.killCtrlAandS).keyup(Utils.killCtrlAandS);
-
- Globals.$win.unload(function () {
- Globals.bUnload = true;
- });
-
- Globals.$html.on('click.dropdown.data-api', function () {
- Utils.detectDropdownVisibility();
- });
+ Globals.$html
+ .addClass(Globals.bMobileDevice ? 'mobile' : 'no-mobile')
+ .on('click.dropdown.data-api', function () {
+ Utils.detectDropdownVisibility();
+ })
+ ;
// export
window['rl'] = window['rl'] || {};
@@ -49,7 +48,6 @@
window['__APP_BOOT'] = function (fCall) {
- // boot
$(function () {
if (window['rainloopTEMPLATES'] && window['rainloopTEMPLATES'][0])
@@ -59,7 +57,11 @@
_.delay(function () {
App.bootstart();
- Globals.$html.removeClass('no-js rl-booted-trigger').addClass('rl-booted');
+
+ Globals.$html
+ .removeClass('no-js rl-booted-trigger')
+ .addClass('rl-booted')
+ ;
}, 10);
}
diff --git a/dev/Common/Globals.js b/dev/Common/Globals.js
index 7f4e4f65e..ce60cbb66 100644
--- a/dev/Common/Globals.js
+++ b/dev/Common/Globals.js
@@ -118,7 +118,7 @@
/**
* @type {*}
*/
- Globals.__APP = null;
+ Globals.__APP__ = null;
/**
* @type {Object}
diff --git a/dev/Common/Plugins.js b/dev/Common/Plugins.js
index da37b5223..c25564796 100644
--- a/dev/Common/Plugins.js
+++ b/dev/Common/Plugins.js
@@ -6,6 +6,7 @@
var
_ = require('_'),
+ Globals = require('Common/Globals'),
Utils = require('Common/Utils')
;
@@ -14,19 +15,15 @@
*/
function Plugins()
{
- this.__boot = null;
- this.__data = null;
- this.__remote = null;
-
this.oSettings = require('Storage:Settings');
-
this.oViewModelsHooks = {};
this.oSimpleHooks = {};
}
- Plugins.prototype.__boot = null;
- Plugins.prototype.__data = null;
- Plugins.prototype.__remote = null;
+ /**
+ * @type {Object}
+ */
+ Plugins.prototype.oSettings = {};
/**
* @type {Object}
@@ -90,9 +87,9 @@
*/
Plugins.prototype.remoteRequest = function (fCallback, sAction, oParameters, iTimeout, sGetAdd, aAbortActions)
{
- if (this.__remote)
+ if (Globals.__APP__)
{
- this.__remote.defaultRequest(fCallback, sAction, oParameters, iTimeout, sGetAdd, aAbortActions);
+ Globals.__APP__.remote().defaultRequest(fCallback, sAction, oParameters, iTimeout, sGetAdd, aAbortActions);
}
};
diff --git a/dev/Common/Utils.js b/dev/Common/Utils.js
index 702b94cc4..660d5c0de 100644
--- a/dev/Common/Utils.js
+++ b/dev/Common/Utils.js
@@ -10,6 +10,7 @@
_ = require('_'),
$ = require('$'),
ko = require('ko'),
+ Autolinker = require('Autolinker'),
Enums = require('Common/Enums'),
Consts = require('Common/Consts'),
@@ -146,7 +147,7 @@
oEmailModel = null,
sEmail = sMailToUrl.replace(/\?.+$/, ''),
sQueryString = sMailToUrl.replace(/^[^\?]*\?/, ''),
- EmailModel = require('Model:Email')
+ EmailModel = require('Model/Email')
;
oEmailModel = new EmailModel();
@@ -1517,10 +1518,10 @@
/**
* @param {string} sPlain
- * @param {boolean} bLinkify = false
+ * @param {boolean} bFindEmailAndLinks = false
* @return {string}
*/
- Utils.plainToHtml = function (sPlain, bLinkify)
+ Utils.plainToHtml = function (sPlain, bFindEmailAndLinks)
{
sPlain = sPlain.toString().replace(/\r/g, '');
@@ -1551,9 +1552,16 @@
}
else if (!bStart && bIn)
{
- bIn = false;
- aNextText.push('~~~/blockquote~~~');
- aNextText.push(sLine);
+ if ('' !== sLine)
+ {
+ bIn = false;
+ aNextText.push('~~~/blockquote~~~');
+ aNextText.push(sLine);
+ }
+ else
+ {
+ aNextText.push(sLine);
+ }
}
else if (bStart && bIn)
{
@@ -1578,6 +1586,7 @@
sPlain = aText.join("\n");
sPlain = sPlain
+// .replace(/~~~\/blockquote~~~\n~~~blockquote~~~/g, '\n')
.replace(/&/g, '&')
.replace(/>/g, '>').replace(/')
@@ -1585,7 +1594,7 @@
.replace(/[\-_~]{10,}/g, '
-
+```
+
+#### Using with the [Bower](http://bower.io) package manager:
+
+Command line:
+
+```shell
+bower install Autolinker.js --save
+```
+
+#### Using with [Node.js](http://nodejs.org) via [npm](https://www.npmjs.org/):
+
+Command Line:
+
+```shell
+npm install autolinker --save
+```
+
+JavaScript:
+
+```javascript
+var Autolinker = require( 'autolinker' );
+// note: npm wants an all-lowercase package name, but the utility is a class and should be
+// aliased with a captial letter
+```
+
+
+## Usage
+
+Using the static `link()` method:
+
+```javascript
+var linkedText = Autolinker.link( textToAutolink[, options] );
+```
+
+Using as a class:
+
+```javascript
+var autolinker = new Autolinker( [ options ] );
+
+var linkedText = autolinker.link( textToAutoLink );
+```
+
+
+#### Example:
+
+```javascript
+var linkedText = Autolinker.link( "Check out google.com", { className: "myLink" } );
+// Produces: "Check out google.com "
+```
+
+## Options
+
+These are the options which may be specified for linking. These are specified by providing an Object as the second parameter to `Autolinker.link()`. These include:
+
+- **newWindow** : Booleangoogle.com "
+```
+
+And if you wanted to truncate the length of URLs (while also not opening in a new window), you could do:
+
+```javascript
+var linkedText = Autolinker.link( "http://www.yahoo.com/some/long/path/to/a/file", { truncate: 25, newWindow: false } );
+// Produces: "yahoo.com/some/long/pat.. "
+```
+
+## More Examples
+One could update an entire DOM element that has unlinked text to auto-link them as such:
+
+```javascript
+var myTextEl = document.getElementById( 'text' );
+myTextEl.innerHTML = Autolinker.link( myTextEl.innerHTML );
+```
+
+Using the same pre-configured Autolinker instance in multiple locations of a codebase (usually by dependency injection):
+
+```javascript
+var autolinker = new Autolinker( { newWindow: false, truncate: 25 } );
+
+//...
+
+autolinker.link( "Check out http://www.yahoo.com/some/long/path/to/a/file" );
+// Produces: "Check out yahoo.com/some/long/pat.. "
+
+//...
+
+autolinker.link( "Go to www.google.com" );
+// Produces: "Go to google.com "
+
+```
+
+
+## Changelog:
+
+### 0.11.0
+
+- Allow Autolinker to link fully-capitalized URLs/Emails/Twitter handles.
+
+### 0.10.1
+
+- Added fix to not autolink strings like "version:1.0", which were accidentally being interpreted as a protocol:domain string.
+
+### 0.10.0
+
+- Added support for protocol-relative URLs (ex: `//google.com`, which will effectively either have the `http://` or `https://`
+ protocol depending on the protocol that is hosting the website)
+
+### 0.9.4
+
+- Fixed an issue where a string in the form of `abc:def` would be autolinked as a protocol and domain name URL. Autolinker now
+ requires the domain name to have at least one period in it to be considered.
+
+### 0.9.3
+
+- Fixed an issue where Twitter handles wouldn't be autolinked if they existed as the sole entity within parenthesis or brackets
+ (thanks [@busticated](https://github.com/busticated) for pointing this out and providing unit tests)
+
+### 0.9.2
+
+- Fixed an issue with nested tags within an existing <a> tag, where the nested tags' inner text would be accidentally
+ removed from the output (thanks [@mjsabin01](https://github.com/mjsabin01))
+
+### 0.9.1
+
+- Added a patch to attempt to better handle extraneous </a> tags in the input string if any exist. This is for when the
+ input may have some invalid markup (for instance, on sites which allow user comments, blog posts, etc.).
+
+### 0.9.0
+
+- Added better support for the processing of existing HTML in the input string. Now handles namespaced tags, and attribute names
+ with dashes or any other Unicode character (thanks [@aziraphale](https://github.com/aziraphale))
+
+### 0.8.0
+
+- Added `className` option for easily styling produced links (thanks [@busticated](https://github.com/busticated))
+- Refactored into a JS class. Autolinker can now be instantiated using:
+
+```javascript
+var autolinker = new Autolinker( { newWindow: false, truncate: 25 } );
+
+autolinker.link( "Check out http://www.yahoo.com/some/long/path/to/a/file" );
+// Produces: "Check out yahoo.com/some/long/pat.. "
+```
+
+This allows options to be set on a single instance, and used throughout a codebase by injecting the `autolinker` instance as a dependency to the modules/classes that use it. (Note: Autolinker may still be used with the static `Autolinker.link()` method as was previously available as well.)
+
+### 0.7.0
+
+- Changed build system to Grunt.
+- Added AMD and CommonJS module loading support (ex: RequireJS, and Node.js's module loader).
+- Added command line Jasmine test runner (`grunt test`)
+- Upgraded Jasmine from 1.3.1 to 2.0
+- Added license header to dist files.
+
+(Thanks to [@busticated](https://github.com/busticated)!)
+
+### 0.6.1
+
+- Added LICENSE file to repository.
+
+### 0.6.0
+
+- Added options for granular control of which types are linked (urls, email addresses, and/or twitter handles).
+ (thanks [@aziraphale](https://github.com/aziraphale))
+
+### 0.5.0
+
+- Simplified the path / query string / hash processing into a single regular expression instead of 3 separate ones.
+- Added support for parenthesis in URLs, such as: `en.wikipedia.org/wiki/IANA_(disambiguation)` (thanks [@dandv](https://github.com/dandv))
+- Add all known top-level domains (TLDs) (thanks [@wouter0100](https://github.com/wouter0100))
+
+### 0.4.0
+
+Merged pull requests from [@afeld](https://github.com/afeld):
+
+- strip protocol and 'www.' by default - fixes #1
+- truncate URLs from the end
+- make simpler regex for detecting prefix
+- remove trailing slashes from URLs, and handle periods at the end of paths
+- re-use domain+TLD regexes for email matching
+- add .me and .io to list of TLDs
+
+Thanks Aidan :)
+
+### 0.3.1
+
+- Fixed an issue with handling nested HTML tags within anchor tags.
+
+### 0.3
+
+- Implemented the `truncate` option.
+
+### 0.2
+
+- Implemented autolinking Twitter handles.
+
+### 0.1
+
+* Initial implementation, which autolinks URLs and email addresses. Working on linking Twitter handles.
diff --git a/webpack.config.js b/webpack.config.js
index 4f8d86c35..55fe39dd9 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -20,6 +20,7 @@ module.exports = {
extensions: ['', '.js'],
alias: {
"ko": __dirname + "/dev/External/ko.js",
+ "openpgp": __dirname + "/vendors/openpgp/openpgp-0.7.2.min.js",
"Knoin:AbstractBoot": __dirname + "/dev/Knoin/KnoinAbstractBoot.js",
"Knoin:AbstractScreen": __dirname + "/dev/Knoin/KnoinAbstractScreen.js",
@@ -31,20 +32,6 @@ module.exports = {
"App:RainLoop": __dirname + "/dev/Apps/RainLoopApp.js",
"App:Admin": __dirname + "/dev/Apps/AdminApp.js",
- "Model:Account": __dirname + "/dev/Models/AccountModel.js",
- "Model:Attachment": __dirname + "/dev/Models/AttachmentModel.js",
- "Model:ComposeAttachment": __dirname + "/dev/Models/ComposeAttachmentModel.js",
- "Model:Contact": __dirname + "/dev/Models/ContactModel.js",
- "Model:ContactProperty": __dirname + "/dev/Models/ContactPropertyModel.js",
- "Model:ContactTag": __dirname + "/dev/Models/ContactTagModel.js",
- "Model:Email": __dirname + "/dev/Models/EmailModel.js",
- "Model:Filter": __dirname + "/dev/Models/FilterModel.js",
- "Model:FilterCondition": __dirname + "/dev/Models/FilterConditionModel.js",
- "Model:Folder": __dirname + "/dev/Models/FolderModel.js",
- "Model:Identity": __dirname + "/dev/Models/IdentityModel.js",
- "Model:Message": __dirname + "/dev/Models/MessageModel.js",
- "Model:OpenPgpKey": __dirname + "/dev/Models/OpenPgpKeyModel.js",
-
"Storage:LocalStorage": __dirname + "/dev/Storages/LocalStorage.js",
"Storage:LocalStorage:Cookie": __dirname + "/dev/Storages/LocalStorages/CookieDriver.js",
"Storage:LocalStorage:LocalStorage": __dirname + "/dev/Storages/LocalStorages/LocalStorageDriver.js",
@@ -137,8 +124,9 @@ module.exports = {
'moment': 'moment',
'ifvisible': 'ifvisible',
'crossroads': 'crossroads',
- 'Jua': 'Jua',
'hasher': 'hasher',
+ 'Jua': 'Jua',
+ 'Autolinker': 'Autolinker',
'ssm': 'ssm',
'key': 'key',
'_': '_',