Remove ubaplyer (too buggy) - warvox - VoIP based wardialing tool, forked from rapid7/warvox.
DIR Log
DIR Files
DIR Refs
DIR README
---
DIR commit d1ca9925b77d6c463f3e85de96b17e219f8f40cf
DIR parent 6fba0686fb93cf3157e42be1dff58a5b9cace5b0
HTML Author: HD Moore <hd_moore@rapid7.com>
Date: Mon, 7 Jan 2013 03:27:01 -0600
Remove ubaplyer (too buggy)
Diffstat:
M Gemfile | 2 +-
M Gemfile.lock | 31 ++++++++++---------------------
M app/assets/javascripts/application… | 1 -
M app/assets/javascripts/dataTables.… | 9 ++++-----
M app/assets/javascripts/dataTables_… | 1 +
D app/assets/javascripts/jquery.ubap… | 223 ------------------------------
D app/assets/javascripts/jquery.ubap… | 5 -----
M app/assets/stylesheets/application… | 4 ++++
M app/assets/stylesheets/bootstrap_a… | 51 -------------------------------
M app/controllers/analyze_controller… | 90 +++++++++++++++++++++++--------
M app/controllers/jobs_controller.rb | 5 ++++-
M app/helpers/application_helper.rb | 30 +++---------------------------
M app/views/analyze/view.html.erb | 60 ++++++++++++++++---------------
M app/views/jobs/index.html.erb | 2 +-
M app/views/jobs/results.html.erb | 4 ++--
M app/views/jobs/view_results.html.e… | 13 +++----------
M app/views/layouts/application.html… | 12 ------------
M app/views/shared/_audio_player.htm… | 1 -
M app/views/shared/_call_info.html.e… | 7 ++++++-
M lib/warvox/jobs/analysis.rb | 4 ++--
20 files changed, 140 insertions(+), 415 deletions(-)
---
DIR diff --git a/Gemfile b/Gemfile
@@ -31,7 +31,7 @@ gem 'formtastic'
gem 'formtastic-bootstrap'
gem 'rails_bootstrap_navbar'
-gem "therubyracer", :group => :assets, :platform => :ruby
+# gem "therubyracer", :group => :assets, :platform => :ruby
gem 'will_paginate', '~> 3.0'
gem 'will_paginate-bootstrap'
DIR diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/dockyard/postgres_ext.git
- revision: a0ac550ecc63f5413b31e808798443a7b7b250eb
+ revision: d114fea48bd27d7d35040b774e479058e3910566
specs:
postgres_ext (0.1.0)
activerecord (~> 3.2.0)
@@ -37,9 +37,9 @@ GEM
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
- authlogic (3.1.0)
- activerecord (>= 3.0.7)
- activerecord (>= 3.0.7)
+ authlogic (3.2.0)
+ activerecord (>= 3.0.0)
+ activesupport (>= 3.0.0)
builder (3.0.4)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
@@ -48,7 +48,6 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.4.0)
- commonjs (0.2.6)
daemons (1.1.9)
dynamic_form (1.1.4)
erubis (2.7.0)
@@ -63,18 +62,13 @@ GEM
hike (1.2.1)
i18n (0.6.1)
journey (1.0.4)
- jquery-datatables-rails (1.11.1)
+ jquery-datatables-rails (1.11.2)
jquery-rails
jquery-rails (2.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.7.5)
+ json (1.7.6)
kissfft (0.0.1)
- less (2.2.2)
- commonjs (~> 0.2.6)
- less-rails (2.2.4)
- actionpack (>= 3.1)
- less (~> 2.2.0)
librex (0.0.68)
mail (2.4.4)
i18n (>= 0.4.0)
@@ -85,7 +79,7 @@ GEM
pg (0.11.0)
pg_array_parser (0.0.8)
polyglot (0.3.3)
- rack (1.4.1)
+ rack (1.4.2)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
@@ -114,8 +108,7 @@ GEM
rake (10.0.3)
rdoc (3.12)
json (~> 1.4)
- ref (1.0.2)
- sass (3.2.4)
+ sass (3.2.5)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
@@ -124,8 +117,6 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- therubyracer (0.11.0)
- ref
thin (1.5.0)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
@@ -135,11 +126,10 @@ GEM
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- twitter-bootstrap-rails (2.1.4)
+ twitter-bootstrap-rails (2.2.0)
actionpack (>= 3.1)
- less-rails (~> 2.2.3)
+ execjs
railties (>= 3.1)
- therubyracer (>= 0.10.2)
tzinfo (0.3.35)
uglifier (1.3.0)
execjs (>= 0.3.0)
@@ -167,7 +157,6 @@ DEPENDENCIES
rails-settings-cached
rails_bootstrap_navbar
sass-rails (~> 3.2.3)
- therubyracer
thin
twitter-bootstrap-rails
uglifier (>= 1.0.3)
DIR diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -2,7 +2,6 @@
// This file is automatically included by javascript_include_tag :defaults
//= require jquery
//= require jquery_ujs
-//= require jquery.ubaplayer
//= require twitter/bootstrap
//= require bootstrap-lightbox
//= require dataTables/jquery.dataTables
DIR diff --git a/app/assets/javascripts/dataTables.fnReloadAjax.js b/app/assets/javascripts/dataTables.fnReloadAjax.js
@@ -20,18 +20,18 @@ jQuery.fn.dataTableExt.oApi.fnReloadAjax = function ( oSettings, sNewSource, fnC
oSettings.fnServerData.call( oSettings.oInstance, oSettings.sAjaxSource, aData, function(json) {
/* Clear the old information from the table */
that.oApi._fnClearTable( oSettings );
-
+
/* Got the data - add it to the table */
var aData = (oSettings.sAjaxDataProp !== "") ?
that.oApi._fnGetObjectDataFn( oSettings.sAjaxDataProp )( json ) : json;
-
+
for ( var i=0 ; i<aData.length ; i++ )
{
that.oApi._fnAddData( oSettings, aData[i] );
}
oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
-
+
if ( typeof bStandingRedraw != 'undefined' && bStandingRedraw === true )
{
oSettings._iDisplayStart = iStart;
@@ -50,4 +50,4 @@ jQuery.fn.dataTableExt.oApi.fnReloadAjax = function ( oSettings, sNewSource, fnC
fnCallback( oSettings );
}
}, oSettings );
-};
-\ No newline at end of file
+};
DIR diff --git a/app/assets/javascripts/dataTables_overrides.js b/app/assets/javascripts/dataTables_overrides.js
@@ -19,6 +19,7 @@ $.fn.dataTableExt.oApi.fnPagingInfo = function ( oSettings )
/* Bootstrap style pagination control */
$.extend( $.fn.dataTableExt.oPagination, {
+
"bootstrap": {
"fnInit": function( oSettings, nPaging, fnDraw ) {
var oLang = oSettings.oLanguage.oPaginate;
DIR diff --git a/app/assets/javascripts/jquery.ubaplayer.js b/app/assets/javascripts/jquery.ubaplayer.js
@@ -1,223 +0,0 @@
-/*! UbaPlayer - v1.0.1 - 2012-06-06
-* https://github.com/brianhadaway/UbaPlayer
-* Copyright (c) 2012 Brian Hadaway; Licensed MIT, GPL */
-
-(function($){
- var defaults = {
- audioButtonClass: "audioButton",
- autoPlay: null,
- codecs: [{name:"OGG", codec: 'audio/ogg; codecs="vorbis"'}, {name:"MP3", codec: 'audio/mpeg'}],
- continuous: false,
- extension: null,
- flashAudioPlayerPath: "libs/swf/player.swf",
- flashExtension: ".mp3",
- flashObjectID: "audioPlayer",
- loadingClass: "loading",
- loop: false,
- playerContainer: "player",
- playingClass: "playing",
- swfobjectPath: "libs/swfobject/swfobject.js",
- volume: 0.5
- },
- currentTrack,
- isPlaying = false,
- isFlash = false,
- audio,
- $buttons,
- $tgt,
- $el,
- playTrack,
- resumeTrack,
- pauseTrack,
- methods = {
- play: function(element){
- $tgt = element;
- currentTrack = _methods.getFileNameWithoutExtension($tgt.attr("href"));
- isPlaying = true;
- $tgt.addClass(defaults.loadingClass);
- $buttons.removeClass(defaults.playingClass);
-
- if(isFlash){
- if(audio) {
- _methods.removeListeners(window);
- }
- audio = document.getElementById(defaults.flashObjectID);
- _methods.addListeners(window);
- audio.playFlash(currentTrack + defaults.extension);
- } else {
- if(audio) {
- audio.pause();
- _methods.removeListeners(audio);
- }
- audio = new Audio("");
- _methods.addListeners(audio);
- audio.id = "audio";
- audio.loop = defaults.loop ? "loop" : "";
- audio.volume = defaults.volume;
- audio.src = currentTrack + defaults.extension;
- audio.play();
- }
- },
-
- pause: function(){
- if(isFlash){
- audio.pauseFlash();
- } else {
- audio.pause();
- }
-
- $tgt.removeClass(defaults.playingClass);
- isPlaying = false;
- },
-
- resume: function(){
- if(isFlash){
- audio.playFlash();
- } else {
- audio.play();
- }
- $tgt.addClass(defaults.playingClass);
- isPlaying = true;
- },
-
- playing: function(){
- return isPlaying;
- }
- },
-
- _methods = {
- init: function( options ){
- var types;
-
- //set defaults
- $.extend(defaults, options);
- $el = this;
-
- //listen for clicks on the controls
- $(".controls").bind("click",function(event){
- _methods.updateTrackState(event);
- return false;
- });
- $buttons = $("."+defaults.audioButtonClass);
-
- types = defaults.codecs;
- for(var i = 0, ilen = types.length; i < ilen; i++){
- var type = types[i];
- if(_methods.canPlay(type)){
- defaults.extension = [".", type.name.toLowerCase()].join("");
- break;
- }
- }
-
- if(!defaults.extension || isFlash){
- isFlash = true;
- defaults.extension = defaults.flashExtension;
- }
-
- if(isFlash){
- $el.html("<div id='" + defaults.playerContainer + "'/>");
- $.getScript(defaults.swfobjectPath,function(){
- swfobject.embedSWF(defaults.flashAudioPlayerPath, defaults.playerContainer, "0", "0", "9.0.0", "swf/expressInstall.swf", false, false, {id:defaults.flashObjectID}, _methods.swfLoaded);
- });
- } else {
- if(defaults.autoPlay){
- methods.play(defaults.autoPlay);
- }
- }
- },
-
- updateTrackState: function( evt ){
- $tgt = $(evt.target);
- if(!$tgt.hasClass("audioButton")){
- return;
- }
- if(!audio || (audio && currentTrack !== _methods.getFileNameWithoutExtension($tgt.attr("href")))){
- methods.play($tgt);
- } else if(!isPlaying) {
- methods.resume();
- } else {
- methods.pause();
- }
- },
-
- addListeners: function(elem) {
- $(elem).bind({"canplay" : _methods.onLoaded,
- "error" : _methods.onError,
- "ended" : _methods.onEnded});
- },
-
- removeListeners: function(elem) {
- $(elem).unbind({"canplay" : _methods.onLoaded,
- "error" : _methods.onError,
- "ended" : _methods.onEnded});
- },
-
- onLoaded: function () {
- $buttons.removeClass(defaults.loadingClass);
- $tgt.addClass(defaults.playingClass);
-
- audio.play();
- },
-
- onError: function () {
- $buttons.removeClass(defaults.loadingClass);
- if(isFlash){
- _methods.removeListeners(window);
- } else {
- _methods.removeListeners(audio);
- }
- },
-
- onEnded: function () {
- isPlaying = false;
- $tgt.removeClass(defaults.playingClass);
- currentTrack = "";
- if(isFlash){
- _methods.removeListeners(window);
- } else {
- _methods.removeListeners(audio);
- }
-
- if(defaults.continuous){
- var $next = $tgt.next().length ? $tgt.next() : $(defaults.audioButtonClass).eq(0);
- methods.play($next);
- }
-
- },
-
- canPlay: function(type) {
- if(!document.createElement("audio").canPlayType){
- return false;
- } else {
- return document.createElement("audio").canPlayType(type.codec).match(/maybe|probably/i) ? true : false;
- }
- },
-
- swfLoaded: function(){
- if(defaults.autoPlay){
- setTimeout(function(){methods.play(defaults.autoPlay);}, 500);
- }
- },
-
- getFileNameWithoutExtension: function(fileName){
- //this function take a full file name and returns an extensionless file name
- //ex. entering foo.mp3 returns foo
- //ex. entering foo returns foo (no change)
-
- var fileNamePieces = fileName.split('.');
- fileNamePieces.pop();
- return fileNamePieces.join(".");
- }
- };
-
- $.fn.ubaPlayer = function(method){
- if(methods[method]){
- return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
- } else if ( typeof method === "object" || ! method ) {
- return _methods.init.apply( this, arguments );
- } else {
- $.error( "Method " + method + " does not exist on jquery.ubaPlayer" );
- }
- };
-
-})(jQuery);
DIR diff --git a/app/assets/javascripts/jquery.ubaplayer.min.js b/app/assets/javascripts/jquery.ubaplayer.min.js
@@ -1,4 +0,0 @@
-/*! UbaPlayer - v1.0.1 - 2012-06-06
-* https://github.com/brianhadaway/UbaPlayer
-* Copyright (c) 2012 Brian Hadaway; Licensed MIT, GPL */
ams.jay.scot:70 /scm/warvox/commit/d1ca9925b77d6c463f3e85de96b17e219f8f40cf.gph:427: line too long