Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509

app/assets/javascripts/new_admin.js

@@ -16,4 +16,4 @@
 //= require orbit-bar-search
 //= require side_bar_history
 //= require rss
-//= require ajax_form
+//= require ajax_form

app/assets/javascripts/tinymce_orbit.js.erb

@@ -4,7 +4,7 @@ function load_tinymce() {
     // General options
     theme: 'advanced',
     file_browser_callback : 'myFileBrowser',
-    plugins : "autolink,lists,spellchecker,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template",
+    plugins : "autolink,lists,pagebreak,style,layer,table,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave",
 
     // Theme options
     theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,fontselect,fontsizeselect",
@@ -42,37 +42,36 @@ function load_tinymce() {
       staffid : "991234"
     }
   });
-  function myFileBrowser (field_name, url, type, win) {
+}
+function myFileBrowser(field_name, url, type, win) {
+    var cmsURL = window.location.toString();
+      cmsURL = cmsURL.split("/");
+      cmsURL = "<%= Rails.application.routes.url_helpers.file_upload_admin_assets_path %>"; 
+      console.log(cmsURL);
+      // script URL - use an absolute path!
+    if (cmsURL.indexOf("?") < 0) {
+        //add the type as the only query parameter
+        cmsURL = cmsURL + "?type=" + type;
+    }
+    else {
+        //add the type as an additional query parameter
+        // (PHP session ID is now included if there is one at all)
+        cmsURL = cmsURL + "&type=" + type;
+    }
 
-
-  var cmsURL = window.location.toString();
-    cmsURL = cmsURL.split("/");
-  //  cmsURL = "http://<?php echo   $_SITE['domain'].$_SITE['rel_path']; ?>/modules/modules/filemanager/"; 
-    
-    // script URL - use an absolute path!
-  if (cmsURL.indexOf("?") < 0) {
-      //add the type as the only query parameter
-      cmsURL = cmsURL + "?type=" + type;
-  }
-  else {
-      //add the type as an additional query parameter
-      // (PHP session ID is now included if there is one at all)
-      cmsURL = cmsURL + "&type=" + type;
-  }
-
-  tinyMCE.activeEditor.windowManager.open({
-      file : cmsURL,
-      title : 'File Browser',
-      width : 850,  // Your dimensions may differ - toy around with them!
-      height : 455,
-      resizable : "no",
-      inline : "no",  // This parameter only has an effect if you use the inlinepopups plugin!
-      close_previous : "no"
-  }, {
-      window : win,
-      input : field_name
-  });
-  return false;
+    tinyMCE.activeEditor.windowManager.open({
+        file : cmsURL,
+        title : 'File Browser',
+        width : 850,  // Your dimensions may differ - toy around with them!
+        height : 455,
+        resizable : "no",
+        inline : "no",  // This parameter only has an effect if you use the inlinepopups plugin!
+        close_previous : "no"
+    }, {
+        window : win,
+        input : field_name,
+    });
+    return false;
   }
   function ajaxSave() {
     var ed = tinyMCE.get('content');
@@ -83,7 +82,6 @@ function load_tinymce() {
       alert(ed.getContent());
     }, 3000);
   }
-}
 
 $(document).ready(function() {
   load_tinymce();