* renaming all ShareDialog to ShareSessionDialog

This commit is contained in:
Seth Call 2014-02-04 17:05:38 +00:00
parent c3a51989fd
commit ae8b6ebbc7
12 changed files with 24 additions and 19 deletions

View File

@ -11,12 +11,16 @@ class ArtifactsController < ApplicationController
file = params[:file]
environment = params[:environment]
@artifact = ArtifactUpdate.find_or_create_by_product_and_environment(product, environment)
ArtifactUpdate.transaction do
# VRFS-1071: Postpone client update notification until installer is available for download
ArtifactUpdate.connection.execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED')
@artifact = ArtifactUpdate.find_or_create_by_product_and_environment(product, environment)
@artifact.version = version
@artifact.uri = file
@artifact.version = version
@artifact.uri = file
@artifact.save
@artifact.save
end
unless @artifact.errors.any?
render :json => {}, :status => :ok

View File

@ -168,6 +168,7 @@
currentTimeMs = playbackDurationMs;
stopPlay();
endReached = true;
console.log("end reached");
}
else {
return;

View File

@ -2,7 +2,7 @@
"use strict";
context.JK = context.JK || {};
context.JK.ShareDialog = function(app) {
context.JK.ShareSessionDialog = function(app) {
var logger = context.JK.logger;
var rest = context.JK.Rest();

View File

@ -8,7 +8,7 @@
//= require web/signupDialog
//= require web/signinDialog
//= require invitationDialog
//= require shareDialog
//= require shareSessionDialog
//= require layout
//= require user_dropdown
//= require jamkazam

View File

@ -32,7 +32,7 @@
*= require ./search
*= require ./ftue
*= require ./invitationDialog
*= require ./shareDialog
*= require ./shareSessionDialog
*= require ./recordingFinishedDialog
*= require ./localRecordingsDialog
*= require ./createSession

View File

@ -7,7 +7,7 @@
*= require client/user_dropdown
*= require client/dialog
*= require client/invitationDialog
*= require client/shareDialog
*= require client/shareSessionDialog
*= require web/main
*= require web/footer
*= require web/recordings

View File

@ -137,7 +137,7 @@
<%= render "addNewGear" %>
<%= render "error" %>
<%= render "sessionSettings" %>
<%= render :partial => "shareDialog" %>
<%= render :partial => "shareSessionDialog" %>
<!-- Track Template -->
<script type="text/template" id="template-session-track">

View File

@ -98,8 +98,8 @@
var invitationDialog = new JK.InvitationDialog(JK.app);
invitationDialog.initialize('<%= SampleApp::Application.config.facebook_key %>');
var shareDialog = new JK.ShareDialog(JK.app);
shareDialog.initialize();
var shareSessionDialog = new JK.ShareSessionDialog(JK.app);
shareSessionDialog.initialize();
var localRecordingsDialog = new JK.LocalRecordingsDialog(JK.app);
localRecordingsDialog.initialize();

View File

@ -78,7 +78,7 @@
<%= javascript_include_tag "web/sessions" %>
<%= render :partial => "clients/shareDialog", :locals => {:session => @music_session, :share_token => @music_session.share_token} %>
<%= render :partial => "clients/shareSessionDialog", :locals => {:session => @music_session, :share_token => @music_session.share_token} %>
<script type="text/javascript">
$(function () {
@ -95,11 +95,11 @@
JK.app = JK.JamKazam();
JK.app.initialize({inClient: false, layoutOpts: {layoutFooter: false}});
var shareDialog = new JK.ShareDialog(JK.app);
shareDialog.initialize();
var shareSessionDialog = new JK.ShareSessionDialog(JK.app);
shareSessionDialog.initialize();
$("#btnShare").click(function(e) {
shareDialog.showDialog();
shareSessionDialog.showDialog();
});
$("#txtSessionComment").keypress(function(e) {

View File

@ -77,7 +77,7 @@
<%= javascript_include_tag "web/recordings" %>
<%= render :partial => "clients/shareDialog", :locals => {:recording => @claimed_recording, :share_token => @claimed_recording.share_token} %>
<%= render :partial => "clients/shareSessionDialog", :locals => {:recording => @claimed_recording, :share_token => @claimed_recording.share_token} %>
<script type="text/javascript">
$(function () {
@ -94,11 +94,11 @@
JK.app = JK.JamKazam();
JK.app.initialize({inClient: false, layoutOpts: {layoutFooter: false}});
var shareDialog = new JK.ShareDialog(JK.app);
shareDialog.initialize();
var shareSessionDialog = new JK.ShareSessionDialog(JK.app);
shareSessionDialog.initialize();
$("#btnShare").click(function(e) {
shareDialog.showDialog();
shareSessionDialog.showDialog();
});
$("#txtRecordingComment").keypress(function(e) {