Skip to content
This repository

The following patches fixed nitrogen on my platform #13

Merged
4 commits merged into from over 3 years ago

2 participants

Gregory Haskins Jan-Felix Wittmann
Gregory Haskins

Please consider for merging

and others added some commits July 05, 2010
Jan-Felix Wittmann patch from Mattias Holmlund to fix an error in the nitrogen javascrip…
…t code, that creates the ajax data object.
32b664b
Fix recv_from_socket in yaws code
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
f3f8ac7
Add missing dependencies
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
92be6bb
Remove redundant reference to nprocreg
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
8241eef
This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 4 unique commits by 2 authors.

Oct 06, 2010
Jan-Felix Wittmann patch from Mattias Holmlund to fix an error in the nitrogen javascrip…
…t code, that creates the ajax data object.
32b664b
Oct 15, 2010
Fix recv_from_socket in yaws code
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
f3f8ac7
Oct 26, 2010
Add missing dependencies
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
92be6bb
Remove redundant reference to nprocreg
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
8241eef
This page is out of date. Refresh to see the latest.
5  apps/nitrogen/ebin/nitrogen.app
@@ -48,6 +48,7 @@
48 48
         element_draggable,
49 49
         element_dropdown,
50 50
         element_droppable,
  51
+	element_file,
51 52
         element_flash,
52 53
         element_function,
53 54
         element_google_chart,
@@ -87,18 +88,20 @@
87 88
         element_template,
88 89
         element_textarea,
89 90
         element_textbox,
  91
+        element_textbox_autocomplete,
90 92
         element_upload,
91 93
         element_value,
92 94
         file_not_found_page,
93 95
         http_basic_auth_security_handler,
94 96
         identity_handler,
95 97
         log_handler,
  98
+	mochiglobal,
  99
+	mochijson2,
96 100
         named_route_handler,
97 101
         nprocreg_registry_handler,
98 102
         nitrogen,
99 103
 	nitrogen_dev,
100 104
         passthrough_route_handler,
101  
-        nprocreg_registry_handler,
102 105
         process_registry_handler,
103 106
         query_handler,
104 107
         role_handler,
4  apps/nitrogen/www/nitrogen.js
@@ -130,7 +130,7 @@ NitrogenClass.prototype.$do_event = function(validationGroup, eventContext, extr
130 130
         return;
131 131
     }
132 132
     // Assemble other parameters... 
133  
-    var params = jQuery.extend(n.$params, validationParams, { eventContext: eventContext });
  133
+    var params = jQuery.extend({}, n.$params, validationParams, { eventContext: eventContext });
134 134
     
135 135
     jQuery.ajax({ 
136 136
         url: this.$url,
@@ -157,7 +157,7 @@ NitrogenClass.prototype.$do_system_event = function(eventContext) {
157 157
     n.$system_event_is_running = true;
158 158
 
159 159
     // Assemble parameters... 
160  
-    var params = jQuery.extend( n.$params, { eventContext: eventContext, is_system_event: 1 });
  160
+    var params = jQuery.extend( {}, n.$params, { eventContext: eventContext, is_system_event: 1 });
161 161
 
162 162
     $.ajax({ 
163 163
 	       url: this.$url,
2  apps/simple_bridge/src/yaws_bridge_modules/yaws_request_bridge.erl
@@ -93,7 +93,7 @@ request_body(Arg) ->
93 93
 socket(Arg) ->
94 94
     Arg#arg.clisock.
95 95
 
96  
-recv_from_socket(Arg, Length, Timeout) -> 
  96
+recv_from_socket(Length, Timeout, Arg) -> 
97 97
     Socket = socket(Arg),
98 98
     case gen_tcp:recv(Socket, Length, Timeout) of
99 99
         {ok, Data} -> Data;
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.