From 20521dc8b0665bf45c9aae09113e90cae98cc361 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 22 Apr 2013 17:59:33 +0800 Subject: [PATCH] removing duplicate code from js file --- app/assets/Archive/javascripts/orbitdesktop.js | 2 ++ .../personal_conference/desktop/conference_pages.js | 8 ++++---- .../javascripts/personal_journal/desktop/journal_pages.js | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/assets/Archive/javascripts/orbitdesktop.js b/app/assets/Archive/javascripts/orbitdesktop.js index 4f4d0edc0..f348adc5d 100755 --- a/app/assets/Archive/javascripts/orbitdesktop.js +++ b/app/assets/Archive/javascripts/orbitdesktop.js @@ -441,7 +441,9 @@ var orbitDesktop = function(dom){ } } } + // call other functions here o.tinyscrollbar_ext(settings,tsettings); + o.simple_drop_down(); o.autocomplete(); o.use_select2(); } diff --git a/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js b/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js index dc968db00..7dd6c302a 100644 --- a/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js +++ b/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js @@ -11,7 +11,7 @@ orbitDesktop.prototype.initializeConferencePapers = function(target,url,cache){ this.initializeConferencePapers.list = function(){ // to open list part in conference papers page var conferenceData; var bindHandlers = function(){ // to bind handlers for list page - o.simple_drop_down(); + } bindHandlers(); @@ -92,7 +92,7 @@ orbitDesktop.prototype.initializeConferencePapers = function(target,url,cache){ } var bindHandlers = function(){ - o.simple_drop_down(); + } bindHandlers(); uploadFiles(); @@ -100,7 +100,7 @@ orbitDesktop.prototype.initializeConferencePapers = function(target,url,cache){ this.initializeConferencePapers.conference = function(){ // to open add pages in conference papers page var bindHandlers = function(){ // to bind handlers for add page - o.simple_drop_down(); + } bindHandlers(); } @@ -115,7 +115,7 @@ orbitDesktop.prototype.initializeConferencePapers = function(target,url,cache){ } this.initializeConferencePapers.coauthor = function(){ // to open add pages in coauthor page var bindHandlers = function(){ // to bind handlers for add page - o.simple_drop_down(); + } bindHandlers(); } diff --git a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js index 68037a224..7ec8416cf 100644 --- a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js +++ b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js @@ -11,7 +11,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // this.initializeJournalPapers.list = function(){ // to open list part in journal papers page var journalData; var bindHandlers = function(){ // to bind handlers for list page - o.simple_drop_down(); + } bindHandlers(); @@ -93,7 +93,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // // console.log("hi"); var bindHandlers = function(){ - o.simple_drop_down(); + } bindHandlers(); @@ -103,7 +103,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // this.initializeJournalPapers.journal = function(){ // to open add pages in journal papers page var bindHandlers = function(){ // to bind handlers for add page - o.simple_drop_down(); + } bindHandlers(); } @@ -118,7 +118,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // } this.initializeJournalPapers.coauthor = function(){ // to open add pages in coauthor page var bindHandlers = function(){ // to bind handlers for add page - o.simple_drop_down(); + } bindHandlers(); }