Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Version bump

  • Loading branch information...
commit af6bda704d110f1f34bed553cc20e93cc04576b7 1 parent 2a99bbf
@quirkey quirkey authored
View
7 HISTORY
@@ -1,3 +1,10 @@
+== 0.1.2 [10-26-10]
+
+- Added mustache plugin for interpolating env and config data into static HTML
+ before push
+- soca purge deletes the design doc
+- Upgraded sammy to 0.6.2
+
== 0.1.1 [10-04-10]
- Fixed compass url (poswald)
View
1  Rakefile
@@ -17,6 +17,7 @@ begin
gem.add_dependency 'thor', '~>0.14.0'
gem.add_dependency 'jim', '~>0.2.3'
gem.add_dependency 'compass', '~>0.10.5'
+ gem.add_dependency 'mustache', '~>0.11.2'
gem.add_development_dependency "shoulda", ">= 0"
gem.add_development_dependency "yard", ">= 0"
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
View
2  lib/soca.rb
@@ -7,7 +7,7 @@
$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__))))
module Soca
- VERSION = '0.1.1'
+ VERSION = '0.1.2'
class << self
attr_accessor :debug
View
2  lib/soca/templates/Jimfile
@@ -7,6 +7,6 @@
sha1
jquery 1.4.2
jquery.couch 0.11
-sammy 0.6.1
+sammy 0.6.2
sammy.couch 0.1.0
js/app
View
2  lib/soca/templates/js/app.js
@@ -1,7 +1,7 @@
(function($) {
var app = $.sammy('#container', function() {
-
+ this.use('Couch');
});
View
31 lib/soca/templates/js/vendor/sammy-0.6.1.js → lib/soca/templates/js/vendor/sammy-0.6.2.js
@@ -1,5 +1,5 @@
// name: sammy
-// version: 0.6.1
+// version: 0.6.2
(function($, window) {
@@ -70,7 +70,7 @@
}
};
- Sammy.VERSION = '0.6.1';
+ Sammy.VERSION = '0.6.2';
// Add to the global logger pool. Takes a function that accepts an
// unknown number of arguments and should print them or send them somewhere
@@ -91,9 +91,9 @@
};
if (typeof window.console != 'undefined') {
- if (_isFunction(console.log.apply)) {
+ if (_isFunction(window.console.log.apply)) {
Sammy.addLogger(function() {
- window.console.log.apply(console, arguments);
+ window.console.log.apply(window.console, arguments);
});
} else {
Sammy.addLogger(function() {
@@ -318,7 +318,18 @@
// An array of the default events triggered by the
// application during its lifecycle
- APP_EVENTS: ['run','unload','lookup-route','run-route','route-found','event-context-before','event-context-after','changed','error','check-form-submission','redirect'],
+ APP_EVENTS: ['run',
+ 'unload',
+ 'lookup-route',
+ 'run-route',
+ 'route-found',
+ 'event-context-before',
+ 'event-context-after',
+ 'changed',
+ 'error',
+ 'check-form-submission',
+ 'redirect',
+ 'location-changed'],
_last_route: null,
_location_proxy: null,
@@ -1153,9 +1164,9 @@
// get current location
location = this.getLocation();
// compare to see if hash has changed
- if (location != this.last_location) {
+ if (!this.last_location || this.last_location[0] != 'get' || this.last_location[1] != location) {
// reset last location
- this.last_location = location;
+ this.last_location = ['get', location];
// lookup route for current hash
returned = this.runRoute('get', location);
}
@@ -1261,7 +1272,7 @@
this.waiting = false;
};
- $.extend(Sammy.RenderContext.prototype, {
+ Sammy.RenderContext.prototype = $.extend({}, Sammy.Object.prototype, {
// The "core" of the `RenderContext` object, adds the `callback` to the
// queue. If the context is `waiting` (meaning an async operation is happening)
@@ -1310,7 +1321,7 @@
this.callbacks.push(callback);
} else {
this.wait();
- setTimeout(function() {
+ window.setTimeout(function() {
var returned = callback.apply(context, [context.content, context.previous_content]);
if (returned !== false) {
context.next(returned);
@@ -1761,7 +1772,7 @@
to = args[0];
}
this.trigger('redirect', {to: to});
- this.app.last_location = this.path;
+ this.app.last_location = [this.verb, this.path];
this.app.setLocation(to);
if (current_location == to) {
this.app.trigger('location-changed');
Please sign in to comment.
Something went wrong with that request. Please try again.