diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-06-12 18:26:22 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-06-12 18:26:22 -0400 |
| commit | 4d02975c65a819c15d38b3df56a454cbfebe636b (patch) | |
| tree | e18e4974e1cbb06868767d3131e962ad81347163 /public/assets/javascripts/ui/lib | |
| parent | f9a05332e51b586b42cffcf144dae6f4b3abe436 (diff) | |
media upload working
Diffstat (limited to 'public/assets/javascripts/ui/lib')
| -rw-r--r-- | public/assets/javascripts/ui/lib/Parser.js | 6 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/lib/view.js | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/public/assets/javascripts/ui/lib/Parser.js b/public/assets/javascripts/ui/lib/Parser.js index 545ed41..46fe09c 100644 --- a/public/assets/javascripts/ui/lib/Parser.js +++ b/public/assets/javascripts/ui/lib/Parser.js @@ -77,7 +77,7 @@ var Parser = { ], parse: function (url, cb) { - Parser.integrations.some(function(integration){ + var matched = Parser.integrations.some(function(integration){ if (integration.regex.test(url)) { integration.fetch(url, function(token, thumbnail){ cb({ @@ -91,6 +91,8 @@ var Parser = { } return false }) - cb(null) + if (! matched) { + cb(null) + } } }
\ No newline at end of file diff --git a/public/assets/javascripts/ui/lib/view.js b/public/assets/javascripts/ui/lib/view.js index 823a75b..5fc6736 100644 --- a/public/assets/javascripts/ui/lib/view.js +++ b/public/assets/javascripts/ui/lib/view.js @@ -80,6 +80,10 @@ var View = (function($, _){ // an element from the `id`, `className` and `tagName` properties. _ensureElement: function() { this.setElement(_.result(this, 'el'), false); + }, + + preventDefault: function(e){ + e && e.preventDefault() } }); |
