Skip to content
Browse files

improving link behavior

  • Loading branch information...
1 parent c17af1f commit a82e8c01ca4d9b17efaef11c711e23c1770dac50 tilleryj committed Jun 16, 2010
View
4 public/javascripts/components/link.js
@@ -28,9 +28,7 @@ rio.components.Link = rio.Component.create(rio.components.Base, "Link", {
linkHtml.observe("click", function(e) {
this.fire("click");
- if(this.getRealLink()) {
- rio.Utils.navigateTo(this.getHref());
- } else {
+ if(!this.getRealLink()) {
e.stop();
}
}.bindAsEventListener(this));
View
10 public/javascripts/lib/boot.js
@@ -171,7 +171,15 @@ var w = window;
}
});
- Object.extend(rio.environment, rio.environments[rio.boot.environment]);
+ var getEnvironment = function(name) {
+ var env = rio.environments[name];
+ if (env.extend && env.extend != name) {
+ env = Object.extend(getEnvironment(env.extend), env);
+ }
+ return env;
+ };
+
+ Object.extend(rio.environment, getEnvironment(rio.boot.environment));
Object.extend(rio.boot, rio.environment.boot);
if (bootOptions.noConsole === undefined) {
View
21 public/javascripts/lib/console/console_commands.js.rej
@@ -1,21 +0,0 @@
-***************
-*** 29,35 ****
- CSS
-
- %>
-- <% if current_user && current_user.login == 'vishu' -%>
- <script src="/javascripts/user.js?<%= Time.now.to_i.to_s %>" type="text/javascript"></script>
- <% end -%>
- <script type="text/javascript">
---- 29,39 ----
- CSS
-
- %>
-+ <%
-+ unless(params[:no_labs])
-+ labs = current_user && (current_user.login == 'vishu' || params[:labs])
-+ end
-+ if labs -%>
- <script src="/javascripts/user.js?<%= Time.now.to_i.to_s %>" type="text/javascript"></script>
- <% end -%>
- <script type="text/javascript">

0 comments on commit a82e8c0

Please sign in to comment.
Something went wrong with that request. Please try again.