Permalink
Browse files

update new js files

  • Loading branch information...
maxwell committed Mar 28, 2012
1 parent 76bbe7b commit e1bf6441fed17153fc0dfdfed67c2426f235ff98
Showing with 16 additions and 3,524 deletions.
  1. +14 −38 Gemfile.lock
  2. 0 {public → app/assets}/javascripts/app/forms.js
  3. 0 {public → app/assets}/javascripts/app/forms/picture_form.js
  4. 0 {public → app/assets}/javascripts/app/forms/post_form.js
  5. 0 {public → app/assets}/javascripts/app/pages/framer.js
  6. 0 {public → app/assets}/javascripts/app/pages/post-new.js
  7. 0 {public → app/assets}/javascripts/app/templates/aspects-dropdown.handlebars
  8. 0 {public → app/assets}/javascripts/app/templates/day.handlebars
  9. 0 {public → app/assets}/javascripts/app/templates/framer.handlebars
  10. 0 {public → app/assets}/javascripts/app/templates/photo-viewer.handlebars
  11. 0 {public → app/assets}/javascripts/app/templates/picture-form.handlebars
  12. 0 {public → app/assets}/javascripts/app/templates/post-form.handlebars
  13. 0 {public → app/assets}/javascripts/app/templates/post-new.handlebars
  14. 0 {public → app/assets}/javascripts/app/templates/services-selector.handlebars
  15. 0 {public → app/assets}/javascripts/app/templates/template-picker.handlebars
  16. 0 {public → app/assets}/javascripts/app/views/aspects_dropdown_view.js
  17. 0 {public → app/assets}/javascripts/app/views/photo_viewer.js
  18. 0 {public → app/assets}/javascripts/app/views/post/day_view.js
  19. 0 {public → app/assets}/javascripts/app/views/services_selector_view.js
  20. 0 {public → app/assets}/javascripts/app/views/stream_post_views.js
  21. 0 {public → app/assets}/javascripts/app/views/template_picker_view.js
  22. +2 −0 app/assets/javascripts/main.js
  23. +0 −54 public/javascripts/apiconsole.js
  24. +0 −604 public/javascripts/vendor/FABridge.js
  25. +0 −92 public/javascripts/vendor/bootstrap/bootstrap-dropdown.js
  26. +0 −68 public/javascripts/vendor/jquery.dnduploader.js
  27. +0 −233 public/javascripts/vendor/jquery.iframe-transport.js
  28. +0 −8 public/javascripts/vendor/jquery.infinitescroll.min.js
  29. +0 −155 public/javascripts/vendor/jquery.mobile-1.0b2.min.js
  30. +0 −69 public/javascripts/vendor/jquery.remotipart.js
  31. +0 −202 public/javascripts/vendor/jquery.tipsy.js
  32. +0 −1,467 public/javascripts/vendor/markdown.js
  33. +0 −14 public/javascripts/vendor/mbp-modernizr-custom.js
  34. +0 −7 public/javascripts/vendor/mbp-respond.min.js
  35. +0 −512 public/javascripts/vendor/punycode.js
  36. +0 −1 spec/javascripts/support/jasmine.yml
View
@@ -34,8 +34,6 @@ GIT
rack-fiber_pool
sinatra
-<<<<<<< HEAD
-=======
GIT
remote: git://github.com/pivotal/jasmine-gem.git
revision: 34c1529c3f7b78ebd81ac16006f141fc6b7cf013
@@ -46,15 +44,6 @@ GIT
rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3)
-GIT
- remote: git://github.com/socialcast/resque-ensure-connected.git
- revision: 8ac0f9e4658495097fb333a93db81d54ba9a5311
- specs:
- resque-ensure-connected (0.2.0)
- activerecord (>= 2.3.5)
- resque (>= 1.10.0)
-
->>>>>>> Fix Jasmine tests - first pass
GEM
remote: http://rubygems.org/
specs:
@@ -161,13 +150,13 @@ GEM
eventmachine (>= 1.0.0.beta.1)
erubis (2.7.0)
eventmachine (1.0.0.beta.4)
- excon (0.12.0)
+ excon (0.13.2)
execjs (1.3.0)
multi_json (~> 1.0)
- factory_girl (2.6.4)
- activesupport (>= 2.3.9)
- factory_girl_rails (1.7.0)
- factory_girl (~> 2.6.0)
+ factory_girl (3.0.0)
+ activesupport (>= 3.0.0)
+ factory_girl_rails (3.0.0)
+ factory_girl (~> 3.0.0)
railties (>= 3.0.0)
faraday (0.7.6)
addressable (~> 2.2)
@@ -181,9 +170,9 @@ GEM
fixture_builder (0.3.1)
activerecord (>= 2)
activesupport (>= 2)
- fog (1.3.0)
+ fog (1.3.1)
builder
- excon (~> 0.12.0)
+ excon (~> 0.13.0)
formatador (~> 0.2.0)
mime-types
multi_json (~> 1.0)
@@ -202,7 +191,7 @@ GEM
rspec-instafail (~> 0.1.8)
ruby-progressbar (~> 0.0.10)
gem_plugin (0.2.3)
- gherkin (2.9.1)
+ gherkin (2.9.3)
json (>= 1.4.6)
haml (3.1.4)
handlebars_assets (0.4.1)
@@ -230,29 +219,16 @@ GEM
actionpack (~> 3.0)
i18n-inflector (~> 2.6)
railties (~> 3.0)
-<<<<<<< HEAD
- jasmine (1.1.2)
- jasmine-core (>= 1.1.0)
- rack (>= 1.1)
- rspec (>= 1.3.1)
- selenium-webdriver (>= 0.1.3)
- jasmine-core (1.1.0)
-<<<<<<< HEAD
- json (1.6.6)
-=======
-=======
jasmine-core (1.2.0.rc1)
->>>>>>> Fix Jasmine tests - first pass
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
- json (1.6.5)
->>>>>>> stylesheets are basically now being served from sprockets
+ json (1.6.6)
jsonpath (0.5.0)
multi_json
jwt (0.1.4)
json (>= 1.2.4)
- kgio (2.7.3)
+ kgio (2.7.4)
launchy (2.0.3)
linecache (0.46)
rbx-require-relative (> 0.0.4)
@@ -269,7 +245,7 @@ GEM
mobile-fu (1.0.0)
rack-mobile-detect
rails
- mock_redis (0.4.0)
+ mock_redis (0.4.1)
mongrel (1.1.5)
cgi_multipart_eof_fix (>= 2.4)
daemons (>= 1.0.3)
@@ -313,7 +289,7 @@ GEM
omniauth-oauth (~> 1.0)
omniauth-twitter (0.0.8)
omniauth-oauth (~> 1.0)
- orm_adapter (0.0.6)
+ orm_adapter (0.0.7)
parallel (0.5.16)
parallel_tests (0.7.2)
parallel
@@ -454,10 +430,10 @@ GEM
typhoeus (0.3.3)
mime-types
tzinfo (0.3.32)
- uglifier (1.2.3)
+ uglifier (1.2.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
- unicorn (4.2.0)
+ unicorn (4.2.1)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
@@ -6,6 +6,7 @@
//= require backbone
//= require rails.validations
//= require jquery.hotkeys
+//= require jquery.remotipart
//= require jquery.autoresize
//= require jquery-ui-1.8.9.custom.min
//= require jquery.charcount
@@ -29,6 +30,7 @@
//= require_tree ./helpers
//= require_tree ./pages
//= require_tree ./widgets
+//= require_tree ./forms
//= require view
//= require aspects-dropdown
//= require contact-edit
@@ -1,54 +0,0 @@
-var ApiConsole = {
-
- prettyPrint: function(obj, indent)
- {
- var result = "";
- if (indent === null) { indent = ""; }
-
- for (var property in obj)
- {
- var value = obj[property];
- if (typeof value == 'string')
- { value = "'" + value + "'"; }
- else if (typeof value == 'object')
- {
- if (value instanceof Array)
- {
- // Just let JS convert the Array to a string!
- value = "[ " + value + " ]";
- }
- else
- {
- // Recursive dump
- // (replace " " by "\t" or something else if you prefer)
- var od = ApiConsole.prettyPrint(value, indent + " ");
- // If you like { on the same line as the key
- //value = "{\n" + od + "\n" + indent + "}";
- // If you prefer { and } to be aligned
- value = "\n" + indent + "{\n" + od + "\n" + indent + "}";
- }
- }
- result += indent + "'" + property + "' : " + value + ",\n";
- }
- return result.replace(/,\n$/, "");
- },
- init: function(field, query_box, button){
- this.field = $(field);
- this.query = $(query_box);
- this.button = $(button);
-
-
- this.button.click(function(){
- $.getJSON(ApiConsole.query.val(), function(data){
- var json = ApiConsole.prettyPrint(data, '');
- console.dir(json);
- ApiConsole.field.html(json);
- });
- });
- }
-};
-
-$(document).ready(function(){
-
- ApiConsole.init('#resp', 'input[name=api]', '#api_submit:input');
-});
Oops, something went wrong.

0 comments on commit e1bf644

Please sign in to comment.